diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 66ab4df..afaca65 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -11055,7 +11055,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11067,7 +11067,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -11910,7 +11910,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11922,7 +11922,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -14787,7 +14787,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -14799,7 +14799,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index f6749f4..f14edf8 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -11054,7 +11054,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11066,7 +11066,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -11909,7 +11909,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11921,7 +11921,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -14786,7 +14786,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -14798,7 +14798,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2
index f6749f4..f14edf8 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -11054,7 +11054,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11066,7 +11066,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -11909,7 +11909,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -11921,7 +11921,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -14786,7 +14786,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -14798,7 +14798,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/build-aux/m4/libtool.m4 b/build-aux/m4/libtool.m4
index ee80844..ab0cd5f 100644
--- a/build-aux/m4/libtool.m4
+++ b/build-aux/m4/libtool.m4
@@ -5157,7 +5157,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5169,7 +5169,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5863,7 +5863,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5875,7 +5875,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6732,7 +6732,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -6744,7 +6744,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
diff --git a/configure.ac b/configure.ac
index b282af6..428a731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_REVISION, 3)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2022)
diff --git a/contrib/debian/gbp.conf b/contrib/debian/gbp.conf
new file mode 100644
index 0000000..a7281f9
--- /dev/null
+++ b/contrib/debian/gbp.conf
@@ -0,0 +1,5 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+pristine-tar = True
+sign-tags = True
diff --git a/contrib/debian/genatrium-qt.lintian-overrides b/contrib/debian/genatrium-qt.lintian-overrides
new file mode 100644
index 0000000..ce40c07
--- /dev/null
+++ b/contrib/debian/genatrium-qt.lintian-overrides
@@ -0,0 +1,2 @@
+# Linked code is Expat - only Debian packaging is GPL-2+
+masterstake-qt: possible-gpl-code-linked-with-openssl
diff --git a/contrib/debian/genatrium-qt.protocol b/contrib/debian/genatrium-qt.protocol
new file mode 100644
index 0000000..eabc248
--- /dev/null
+++ b/contrib/debian/genatrium-qt.protocol
@@ -0,0 +1,11 @@
+[Protocol]
+exec=masterstake-qt '%u'
+protocol=masterstake
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
diff --git a/contrib/debian/genatriumd.install b/contrib/debian/genatriumd.install
new file mode 100644
index 0000000..289db57
--- /dev/null
+++ b/contrib/debian/genatriumd.install
@@ -0,0 +1,2 @@
+usr/local/bin/masterstaked usr/bin
+usr/local/bin/masterstake-cli usr/bin
diff --git a/contrib/debian/genatriumd.lintian-overrides b/contrib/debian/genatriumd.lintian-overrides
new file mode 100644
index 0000000..11edf8b
--- /dev/null
+++ b/contrib/debian/genatriumd.lintian-overrides
@@ -0,0 +1,2 @@
+# Linked code is Expat - only Debian packaging is GPL-2+
+masterstaked: possible-gpl-code-linked-with-openssl
diff --git a/contrib/debian/genatriumd.manpages b/contrib/debian/genatriumd.manpages
new file mode 100644
index 0000000..8b24d40
--- /dev/null
+++ b/contrib/debian/genatriumd.manpages
@@ -0,0 +1,2 @@
+debian/manpages/masterstaked.1
+debian/manpages/masterstake.conf.5
diff --git a/contrib/gitian-keys/fuzzbawls-key.gpg b/contrib/gitian-keys/fuzzbawls-key.gpg
index 80dccc6..18ea4c2 100644
--- a/contrib/gitian-keys/fuzzbawls-key.gpg
+++ b/contrib/gitian-keys/fuzzbawls-key.gpg
@@ -94,7 +94,7 @@ AYT/AGj0rt4YYtLsA5UGTblFPQe59B/Wue1a4TR4Gvbxi15KdyR91PqR6/y6VyOq
 5zsbSoqETltUX7IpDAG5k42/3BWfBYyiHzEC7gP4hk/nTjdLMzXE7bpGPOOgrb0U
 LembK/KqdjmuyE+Xc5vZc7stzm2aYSbZEO49KS6tnNpI5+8FP4V095pQW4V8gcH5
 ema0U8NRXGiXVxJPCsixb4odwJY56VdTFwpxTluzP6q+Z3OPWzIjV1OCQDkd6iMM
-jswY7dvYV3t1oVhaaZBLBqNvJKYl3xk8hvSsQ2MTKzoAc+hpUcZCrsEsNbYykt0M
+jswY7dvYV3t1oVhaaZBLBqNvJKYl3xk8hvSsQ2MTKzoAc+hpUCMastersEsNbYykt0M
 EaAfjS2twNOnFvcIXt5OOf4fepLmSS3wEjBBOM1E8FzcuskiquOBmibu7Gijy6o3
 f7NjV4L6ICa3/vEcD2b0Poe9bcVhFc24aPJT/a6r7H3rndGvbzTpWxF5lu3EqdQK
 6y0KEC7sH3QFcOhHK+zD09+1clSU6b1PQoRhUWxg6loflxvMnBVc5HeuIuZnLkKu
diff --git a/contrib/init/zcore.conf b/contrib/init/zcore.conf
new file mode 100644
index 0000000..5fb9fb9
--- /dev/null
+++ b/contrib/init/zcore.conf
@@ -0,0 +1,63 @@
+description "MasterStake Daemon"
+
+start on runlevel [2345]
+stop on starting rc RUNLEVEL=[016]
+
+env BITCOIND_BIN="/usr/bin/masterstaked"
+env BITCOIND_USER="masterstake"
+env BITCOIND_GROUP="masterstake"
+env BITCOIND_PIDDIR="/var/run/masterstaked"
+# upstart can't handle variables constructed with other variables
+env BITCOIND_PIDFILE="/var/run/masterstaked/masterstaked.pid"
+env BITCOIND_CONFIGFILE="/etc/masterstake/masterstake.conf"
+env BITCOIND_DATADIR="/var/lib/masterstaked"
+
+expect fork
+
+respawn
+respawn limit 5 120
+kill timeout 60
+
+pre-start script
+    # this will catch non-existent config files
+    # masterstaked will check and exit with this very warning, but it can do so
+    # long after forking, leaving upstart to think everything started fine.
+    # since this is a commonly encountered case on install, just check and
+    # warn here.
+    if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then
+        echo "ERROR: You must set a secure rpcpassword to run masterstaked."
+        echo "The setting must appear in $BITCOIND_CONFIGFILE"
+        echo
+        echo "This password is security critical to securing wallets "
+        echo "and must not be the same as the rpcuser setting."
+        echo "You can generate a suitable random password using the following"
+        echo "command from the shell:"
+        echo
+        echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
+        echo
+        echo "It is also recommended that you also set alertnotify so you are "
+        echo "notified of problems:"
+        echo
+        echo "ie: alertnotify=echo %%s | mail -s \"MasterStake Alert\"" \
+            "admin@foo.com"
+        echo
+        exit 1
+    fi
+
+    mkdir -p "$BITCOIND_PIDDIR"
+    chmod 0755 "$BITCOIND_PIDDIR"
+    chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_PIDDIR"
+    chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_CONFIGFILE"
+    chmod 0660 "$BITCOIND_CONFIGFILE"
+end script
+
+exec start-stop-daemon \
+    --start \
+    --pidfile "$BITCOIND_PIDFILE" \
+    --chuid $BITCOIND_USER:$BITCOIND_GROUP \
+    --exec "$BITCOIND_BIN" \
+    -- \
+    -pid="$BITCOIND_PIDFILE" \
+    -conf="$BITCOIND_CONFIGFILE" \
+    -datadir="$BITCOIND_DATADIR" \
+    -daemon
diff --git a/contrib/init/zcored.init b/contrib/init/zcored.init
new file mode 100644
index 0000000..7a79646
--- /dev/null
+++ b/contrib/init/zcored.init
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+#  masterstaked The MasterStake core server.
+#
+#
+# chkconfig: 345 80 20
+# description: masterstaked
+# processname: masterstaked
+#
+
+# Source function library.
+. /etc/init.d/functions
+
+# you can override defaults in /etc/sysconfig/masterstaked, see below
+if [ -f /etc/sysconfig/masterstaked ]; then
+        . /etc/sysconfig/masterstaked
+fi
+
+RETVAL=0
+
+prog=masterstaked
+# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/masterstaked
+lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/masterstaked}
+
+# masterstaked defaults to /usr/bin/masterstaked, override with BITCOIND_BIN
+bitcoind=${BITCOIND_BIN-/usr/bin/masterstaked}
+
+# masterstaked opts default to -disablewallet, override with BITCOIND_OPTS
+bitcoind_opts=${BITCOIND_OPTS}
+
+start() {
+    echo -n $"Starting $prog: "
+    daemon $DAEMONOPTS $bitcoind $bitcoind_opts
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch $lockfile
+    return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    return $RETVAL
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    status)
+        status $prog
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    *)
+        echo "Usage: service $prog {start|stop|status|restart}"
+        exit 1
+        ;;
+esac
diff --git a/contrib/init/zcored.openrc b/contrib/init/zcored.openrc
new file mode 100644
index 0000000..f10a611
--- /dev/null
+++ b/contrib/init/zcored.openrc
@@ -0,0 +1,86 @@
+#!/sbin/runscript
+
+# backward compatibility for existing gentoo layout
+#
+if [ -d "/var/lib/masterstake/.masterstake" ]; then
+	BITCOIND_DEFAULT_DATADIR="/var/lib/masterstake/.masterstake"
+else
+	BITCOIND_DEFAULT_DATADIR="/var/lib/masterstaked"
+fi
+
+BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/masterstake/masterstake.conf}
+BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/masterstaked}
+BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/masterstaked.pid}
+BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
+BITCOIND_USER=${BITCOIND_USER:-masterstake}
+BITCOIND_GROUP=${BITCOIND_GROUP:-masterstake}
+BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/masterstaked}
+
+name="MasterStake Daemon"
+description="MasterStake crypto-currency p2p network daemon"
+
+command="/usr/bin/masterstaked"
+command_args="-pid=\"${BITCOIND_PIDFILE}\" \
+		-conf=\"${BITCOIND_CONFIGFILE}\" \
+		-datadir=\"${BITCOIND_DATADIR}\" \
+		-daemon \
+		${BITCOIND_OPTS}"
+
+required_files="${BITCOIND_CONFIGFILE}"
+start_stop_daemon_args="-u ${BITCOIND_USER} \
+			-N ${BITCOIND_NICE:-0} -w 2000"
+pidfile="${BITCOIND_PIDFILE}"
+retry=60
+
+depend() {
+	need localmount net
+}
+
+# verify
+# 1) that the datadir exists and is writable (or create it)
+# 2) that a directory for the pid exists and is writable
+# 3) ownership and permissions on the config file
+start_pre() {
+	checkpath \
+	-d \
+	--mode 0750 \
+	--owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \
+	"${BITCOIND_DATADIR}"
+
+	checkpath \
+	-d \
+	--mode 0755 \
+	--owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \
+	"${BITCOIND_PIDDIR}"
+
+	checkpath -f \
+	-o ${BITCOIND_USER}:${BITCOIND_GROUP} \
+	-m 0660 \
+	${BITCOIND_CONFIGFILE}
+
+	checkconfig || return 1
+}
+
+checkconfig()
+{
+	if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then
+		eerror ""
+		eerror "ERROR: You must set a secure rpcpassword to run masterstaked."
+		eerror "The setting must appear in ${BITCOIND_CONFIGFILE}"
+		eerror ""
+		eerror "This password is security critical to securing wallets "
+		eerror "and must not be the same as the rpcuser setting."
+		eerror "You can generate a suitable random password using the following"
+		eerror "command from the shell:"
+		eerror ""
+		eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
+		eerror ""
+		eerror "It is also recommended that you also set alertnotify so you are "
+		eerror "notified of problems:"
+		eerror ""
+		eerror "ie: alertnotify=echo %%s | mail -s \"MasterStake Alert\"" \
+			"admin@foo.com"
+		eerror ""
+		return 1
+	fi
+}
diff --git a/contrib/init/zcored.openrcconf b/contrib/init/zcored.openrcconf
new file mode 100644
index 0000000..543c78c
--- /dev/null
+++ b/contrib/init/zcored.openrcconf
@@ -0,0 +1,26 @@
+# /etc/conf.d/masterstaked: config file for /etc/init.d/masterstaked
+
+# Config file location
+#BITCOIND_CONFIGFILE="/etc/masterstake/masterstake.conf"
+
+# What directory to write pidfile to?  (created and owned by $BITCOIND_USER)
+#BITCOIND_PIDDIR="/var/run/masterstaked"
+
+# What filename to give the pidfile
+#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/masterstaked.pid"
+
+# Where to write masterstaked data (be mindful that the blockchain is large)
+#BITCOIND_DATADIR="/var/lib/masterstaked"
+
+# User and group to own masterstaked process
+#BITCOIND_USER="masterstake"
+#BITCOIND_GROUP="masterstake"
+
+# Path to masterstaked executable
+#BITCOIND_BIN="/usr/bin/masterstaked"
+
+# Nice value to run masterstaked under
+#BITCOIND_NICE=0
+
+# Additional options (avoid -conf and -datadir, use flags above)
+BITCOIND_OPTS=""
diff --git a/contrib/init/zcored.service b/contrib/init/zcored.service
new file mode 100644
index 0000000..aff1b7a
--- /dev/null
+++ b/contrib/init/zcored.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=MasterStake's distributed currency daemon
+After=network.target
+
+[Service]
+User=masterstake
+Group=masterstake
+
+Type=forking
+PIDFile=/var/lib/masterstaked/masterstaked.pid
+
+ExecStart=/usr/bin/masterstaked -daemon -pid=/var/lib/masterstaked/masterstaked.pid \
+          -conf=/etc/masterstake/masterstake.conf -datadir=/var/lib/masterstaked
+
+ExecStop=-/usr/bin/masterstake-cli -conf=/etc/masterstake/masterstake.conf \
+         -datadir=/var/lib/masterstaked stop
+
+Restart=always
+PrivateTmp=true
+TimeoutStopSec=60s
+TimeoutStartSec=2s
+StartLimitInterval=120s
+StartLimitBurst=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/doc/README.md b/doc/README.md
index 93628a6..94d00f1 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -3,7 +3,7 @@ MasterStake
 
 Setup
 ---------------------
-[MasterStake](https://zcrcoin.io/) is the original MasterStake client and it builds the backbone of the network. However, it downloads and stores the entire history of MasterStake transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
+[MasterStake](https://mastercoin.io/) is the original MasterStake client and it builds the backbone of the network. However, it downloads and stores the entire history of MasterStake transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
 
 Running
 ---------------------
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index 783a1a7..5ac9bd3 100644
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -8,8 +8,8 @@
 # Does the following:
 #   a) creates 3 nodes, with an empty chain (no blocks).
 #   b) node0 mines a block
-#   c) node1 mines 32 blocks, so now node 0 has 60001zcr, node 1 has 4250zcr, node2 has none.
-#   d) node0 sends 601 zcr to node2, in two transactions (301 zcr, then 300 zcr).
+#   c) node1 mines 32 blocks, so now node 0 has 60001master, node 1 has 4250master, node2 has none.
+#   d) node0 sends 601 master to node2, in two transactions (301 master, then 300 master).
 #   e) node0 mines a block, collects the fee on the second transaction
 #   f) node1 mines 16 blocks, to mature node0's just-mined block
 #   g) check that node0 has 100-21, node2 has 21
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 1ec7990..5506a46 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -127,7 +127,7 @@ class CMainParams : public CChainParams
 
         nSubsidyHalvingBlock = 1000;
         
-        strDevFeeAddress = "MHrThmoWKXH9qqhVTRmnBXtPks7u2xGABe", "MTPjTgHQGsd3hkkY7rUaxWnXU4yJvHpDFp";
+        strDevFeeAddress = "MHrThmoWKXH9qqhVTRmnBXtPks7u2xGABe";
 
         /** Height or Time Based Activations **/
         nLastPOWBlock = 200;
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index 961d36f..b19dedc 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -56,7 +56,7 @@ const std::string CLIENT_NAME("MasterStake");
     "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "" commit
 
 #define BUILD_DESC_FROM_UNKNOWN(maj, min, rev, build) \
-    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-REV"
+    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-POS"
 
 #ifndef BUILD_DESC
 #ifdef BUILD_SUFFIX
diff --git a/src/init.cpp b/src/init.cpp
index ab5430f..da06bc2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -518,7 +518,7 @@ std::string HelpMessage(HelpMessageMode mode)
 #ifdef ENABLE_WALLET
     strUsage += HelpMessageGroup(_("Staking options:"));
     strUsage += HelpMessageOpt("-staking=<n>", strprintf(_("Enable staking functionality (0-1, default: %u)"), 1));
-    strUsage += HelpMessageOpt("-zcrstake=<n>", strprintf(_("Enable or disable staking functionality for MASTERinputs (0-1, default: %u)"), 1));
+    strUsage += HelpMessageOpt("-masterstake=<n>", strprintf(_("Enable or disable staking functionality for MASTERinputs (0-1, default: %u)"), 1));
     strUsage += HelpMessageOpt("-zmasterstake=<n>", strprintf(_("Enable or disable staking functionality for zMASTERinputs (0-1, default: %u)"), 1));
     strUsage += HelpMessageOpt("-reservebalance=<amt>", _("Keep the specified amount available for spending at all times (default: 0)"));
     if (GetBoolArg("-help-debug", false)) {
diff --git a/src/kernel.cpp b/src/kernel.cpp
index 8fd85f1..b06d8c1 100644
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -370,9 +370,9 @@ bool CheckProofOfStake(const CBlock block, uint256& hashProofOfStake, std::uniqu
         if (!VerifyScript(txin.scriptSig, txPrev.vout[txin.prevout.n].scriptPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&tx, 0)))
             return error("CheckProofOfStake() : VerifySignature failed on coinstake %s", tx.GetHash().ToString().c_str());
 
-        CZcrStake* zcrInput = new CZcrStake();
-        zcrInput->SetInput(txPrev, txin.prevout.n);
-        stake = std::unique_ptr<CStakeInput>(zcrInput);
+        CMasterStake* masterInput = new CMasterStake();
+        masterInput->SetInput(txPrev, txin.prevout.n);
+        stake = std::unique_ptr<CStakeInput>(masterInput);
     }
 
     CBlockIndex* pindex = stake->GetIndexFrom();
diff --git a/src/main.cpp b/src/main.cpp
index a44c1a4..c55412b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1791,18 +1791,15 @@ CAmount GetCurrentCollateral()
 {
     int blockHeight = chainActive.Height();
 
-    if (blockHeight >  600000) return  500000 ; /* Fase Reward -  10 Master */
-    if (blockHeight >  525000) return  425000 ; /* Fase Reward -  15 Master */
-    if (blockHeight >  380000) return  350000 ; /* Fase Reward -  25 Master */
-    if (blockHeight >  375000) return  250000 ; /* Fase Bônus  - 100 Master */
-    if (blockHeight >  300000) return  200000 ; /* Fase Reward -  15 Master */
-    if (blockHeight >  225000) return  150000 ; /* Fase Reward -  25 Master */
+    if (blockHeight >  375000) return  250000 ; /* Fase Reward -  10 Master */
+    if (blockHeight >  230000) return  150000 ; /* Fase Reward -  15 Master */
+    if (blockHeight >  225000) return  150000 ; /* Fase Bõnus  - 100 Master */
     if (blockHeight >  150000) return  100000 ; /* Fase Reward -  35 Master */ 
     if (blockHeight >   70000) return  125000 ; /* Fase Reward -  50 Master */ 
     if (blockHeight >     200) return   15000 ;  
 
 
-    return 500000 ;
+    return 150000 ;
 
 }
 
@@ -1840,17 +1837,11 @@ int64_t GetBlockValue(int nHeight)
         nSubsidy = COIN * 50;
     } else if ( nHeight >= 150001 && nHeight <= 225000) { /* Fase Collateral - 100000 Master */
         nSubsidy = COIN * 35;
-    } else if ( nHeight >= 225001 && nHeight <= 300000) { /* Fase Collateral - 150000 Master */
-        nSubsidy = COIN * 25;
-    } else if ( nHeight >= 300001 && nHeight <= 375000) { /* Fase Collateral - 200000 Master */
-        nSubsidy = COIN * 15;
-    } else if ( nHeight >= 375001 && nHeight <= 380000) { /* Fase Collateral - 250000 Master */
+    } else if ( nHeight >= 225001 && nHeight <= 230000) { /* Fase Collateral - 150000 Master */
         nSubsidy = COIN * 100;
-    } else if ( nHeight >= 380001 && nHeight <= 525000) { /* Bônus Collateral - 350000 Master */
-        nSubsidy = COIN * 25;
-    } else if ( nHeight >= 525001 && nHeight <= 600000) { /* Fase Collateral - 425000 Master */
-        nSubsidy = COIN * 15; 
-    } else if ( nHeight >= 600001 && nHeight <= 5000000) { /* Fase Collateral - 500000 Master */
+    } else if ( nHeight >= 230001 && nHeight <= 375000) { /* Fase Collateral - 250000 Master */
+        nSubsidy = COIN * 15;
+    } else if ( nHeight >= 375001 && nHeight <= 5000000) { /* Fase Collateral - 250000 Master */
         nSubsidy = COIN * 10;
     } else {
         nSubsidy = COIN * 10;
@@ -1865,16 +1856,14 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, bool isZMASTERStak
         nMNSubsidy = COIN * 0;
     } else if (nHeight >= Params().LAST_POW_BLOCK() && nHeight <= 65000){
         nMNSubsidy = blockValue *  0.80;
-    } else if ( nHeight >= 65001 && nHeight <= 224900) {
+    } else if ( nHeight >= 65001 && nHeight <= 229975) {
         nMNSubsidy = blockValue *  0.90;
-    } else if ( nHeight >= 224901 && nHeight <= 374950) {
-        nMNSubsidy = blockValue *  0.80;
-    } else if ( nHeight >= 374951 && nHeight <= 379975) {
-        nMNSubsidy = blockValue *  0.95;
-    } else if ( nHeight >= 379976 && nHeight <= 5000000) {
-        nMNSubsidy = blockValue *  0.85;            
+    } else if ( nHeight >= 229976 && nHeight <= 374975) {
+        nMNSubsidy = blockValue *  0.75;
+    } else if ( nHeight >= 374976 && nHeight <= 5000000) {
+        nMNSubsidy = blockValue *  0.70;            
     } else{
-        nMNSubsidy = blockValue *  0.85;
+        nMNSubsidy = blockValue *  0.70;
     }
     return nMNSubsidy;
 }
@@ -1885,8 +1874,12 @@ int64_t GetDevelopersPayment(int nHeight) {
         nDFSubsidy = COIN * 0;
     } else if (nHeight >= Params().LAST_POW_BLOCK()  && nHeight <= 29999) {
        nDFSubsidy = COIN * 0.50;
-    } else if ( nHeight >= 30000 && nHeight <= 5000000) {
+    } else if ( nHeight >= 30000 && nHeight <= 225005) {
        nDFSubsidy = COIN * 1.50;
+    } else if ( nHeight >= 225006 && nHeight <= 229995) {
+       nDFSubsidy = COIN * 5.00;
+    } else if ( nHeight >= 229996 && nHeight <= 5000000) {
+       nDFSubsidy = COIN * 1.50;      
     } else {
        nDFSubsidy = COIN * 1.50;
     }
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 6e4407c..76d9b00 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -160,13 +160,13 @@ class CTxOut
 
     bool IsDust(CFeeRate minRelayTxFee) const
     {
-        // "Dust" is defined in terms of CTransaction::minRelayTxFee, which has units uzcr-per-kilobyte.
+        // "Dust" is defined in terms of CTransaction::minRelayTxFee, which has units umaster-per-kilobyte.
         // If you'd pay more than 1/3 in fees to spend something, then we consider it dust.
         // A typical txout is 34 bytes big, and will need a CTxIn of at least 148 bytes to spend
-        // i.e. total is 148 + 32 = 182 bytes. Default -minrelaytxfee is 10000 uzcr per kB
-        // and that means that fee per txout is 182 * 10000 / 1000 = 1820 uzcr.
-        // So dust is a txout less than 1820 *3 = 5460 uzcr
-        // with default -minrelaytxfee = minRelayTxFee = 10000 uzcr per kB.
+        // i.e. total is 148 + 32 = 182 bytes. Default -minrelaytxfee is 10000 umaster per kB
+        // and that means that fee per txout is 182 * 10000 / 1000 = 1820 umaster.
+        // So dust is a txout less than 1820 *3 = 5460 umaster
+        // with default -minrelaytxfee = minRelayTxFee = 10000 umaster per kB.
         size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
         return (nValue < 3*minRelayTxFee.GetFee(nSize));
     }
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index e8ecf7d..6cdecb7 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -710,7 +710,7 @@ void CoinControlDialog::updateLabels(WalletModel* model, QDialog* dialog)
         dFeeVary = (double)std::max(CWallet::minTxFee.GetFeePerK(), payTxFee.GetFeePerK()) / 1000;
     else
         dFeeVary = (double)std::max(CWallet::minTxFee.GetFeePerK(), mempool.estimateFee(nTxConfirmTarget).GetFeePerK()) / 1000;
-    QString toolTip4 = tr("Can vary +/- %1 uzcr per input.").arg(dFeeVary);
+    QString toolTip4 = tr("Can vary +/- %1 umaster per input.").arg(dFeeVary);
 
     l3->setToolTip(toolTip4);
     l4->setToolTip(toolTip4);
diff --git a/src/qt/forms/privacydialog.ui b/src/qt/forms/privacydialog.ui
index e51910b..721ce4f 100644
--- a/src/qt/forms/privacydialog.ui
+++ b/src/qt/forms/privacydialog.ui
@@ -270,7 +270,7 @@
                            </size>
                           </property>
                           <property name="toolTip">
-                           <string>Enter an amount of Zcr to convert to zMASTER</string>
+                           <string>Enter an amount of Master to convert to zMASTER</string>
                           </property>
                           <property name="text">
                            <string>Mint Zerocoin</string>
@@ -322,7 +322,7 @@
                            </font>
                           </property>
                           <property name="toolTip">
-                           <string>Enter an amount of Zcr to convert to zMASTER</string>
+                           <string>Enter an amount of Master to convert to zMASTER</string>
                           </property>
                           <property name="text">
                            <string>0.000 000 00 MASTER</string>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 61ea780..ea7c488 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -211,7 +211,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed
     }
     // MASTER Balance
     CAmount nTotalBalance = balance + unconfirmedBalance;
-    CAmount zcrAvailableBalance = balance - immatureBalance - nLockedBalance > 0 ? balance - immatureBalance - nLockedBalance : 0;
+    CAmount masterAvailableBalance = balance - immatureBalance - nLockedBalance > 0 ? balance - immatureBalance - nLockedBalance : 0;
     CAmount nTotalWatchBalance = watchOnlyBalance + watchUnconfBalance + watchImmatureBalance;    
     CAmount nUnlockedBalance = nTotalBalance - nLockedBalance;
 
@@ -222,11 +222,11 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed
     QString sPercentage = "";
     getPercentage(nUnlockedBalance, zerocoinBalance, sPercentage, szPercentage);
     // Combined balances
-    CAmount availableTotalBalance = zcrAvailableBalance + matureZerocoinBalance;
+    CAmount availableTotalBalance = masterAvailableBalance + matureZerocoinBalance;
     CAmount sumTotalBalance = nTotalBalance + zerocoinBalance;
 
     // MASTER labels
-    ui->labelBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, zcrAvailableBalance, false, BitcoinUnits::separatorAlways));
+    ui->labelBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, masterAvailableBalance, false, BitcoinUnits::separatorAlways));
     ui->labelUnconfirmed->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, unconfirmedBalance, false, BitcoinUnits::separatorAlways));
     ui->labelImmature->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, immatureBalance, false, BitcoinUnits::separatorAlways));
     ui->labelLockedBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, nLockedBalance, false, BitcoinUnits::separatorAlways));
@@ -271,7 +271,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed
     bool showSumAvailable = settingShowAllBalances || sumTotalBalance != availableTotalBalance;
     ui->labelBalanceTextz->setVisible(showSumAvailable);
     ui->labelBalancez->setVisible(showSumAvailable);
-    bool showMASTERAvailable = settingShowAllBalances || zcrAvailableBalance != nTotalBalance;
+    bool showMASTERAvailable = settingShowAllBalances || masterAvailableBalance != nTotalBalance;
     bool showWatchOnlyMASTERAvailable = watchOnlyBalance != nTotalWatchBalance;
     bool showMASTERPending = settingShowAllBalances || unconfirmedBalance != 0;
     bool showWatchOnlyMASTERPending = watchUnconfBalance != 0;
diff --git a/src/qt/privacydialog.cpp b/src/qt/privacydialog.cpp
index 922fb05..2fb4d97 100644
--- a/src/qt/privacydialog.cpp
+++ b/src/qt/privacydialog.cpp
@@ -506,7 +506,7 @@ void PrivacyDialog::sendzMASTER()
 
     CAmount nValueOut = 0;
     for (const CTxOut& txout: wtxNew.vout) {
-        strStats += tr("value out: ") + FormatMoney(txout.nValue).c_str() + " Zcr, ";
+        strStats += tr("value out: ") + FormatMoney(txout.nValue).c_str() + " Master, ";
         nValueOut += txout.nValue;
 
         strStats += tr("address: ");
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 747b413..2f6b518 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -279,8 +279,8 @@ UniValue prioritisetransaction(const UniValue& params, bool fHelp)
             "1. \"txid\"       (string, required) The transaction id.\n"
             "2. priority delta (numeric, required) The priority to add or subtract.\n"
             "                  The transaction selection algorithm considers the tx as it would have a higher priority.\n"
-            "                  (priority of a transaction is calculated: coinage * value_in_uzcr / txsize) \n"
-            "3. fee delta      (numeric, required) The fee value (in uzcr) to add (or subtract, if negative).\n"
+            "                  (priority of a transaction is calculated: coinage * value_in_umaster / txsize) \n"
+            "3. fee delta      (numeric, required) The fee value (in umaster) to add (or subtract, if negative).\n"
             "                  The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
             "                  considers the transaction as it would have paid a higher (or lower) fee.\n"
 
@@ -350,7 +350,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "             n                        (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n"
             "             ,...\n"
             "         ],\n"
-            "         \"fee\": n,                   (numeric) difference in value between transaction inputs and outputs (in uzcr); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
+            "         \"fee\": n,                   (numeric) difference in value between transaction inputs and outputs (in umaster); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n"
             "         \"sigops\" : n,               (numeric) total number of SigOps, as counted for purposes of block limits; if key is not present, sigop count is unknown and clients MUST NOT assume there aren't any\n"
             "         \"required\" : true|false     (boolean) if provided and true, this transaction must be in the final block\n"
             "      }\n"
@@ -359,7 +359,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "  \"coinbaseaux\" : {                  (json object) data that should be included in the coinbase's scriptSig content\n"
             "      \"flags\" : \"flags\"            (string) \n"
             "  },\n"
-            "  \"coinbasevalue\" : n,               (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in uzcr)\n"
+            "  \"coinbasevalue\" : n,               (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in umaster)\n"
             "  \"coinbasetxn\" : { ... },           (json object) information for coinbase transaction\n"
             "  \"target\" : \"xxxx\",               (string) The hash target\n"
             "  \"mintime\" : xxx,                   (numeric) The minimum timestamp appropriate for next block time in seconds since epoch (Jan 1 1970 GMT)\n"
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 925959b..6c0a9d2 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -2667,7 +2667,7 @@ UniValue mintzerocoin(const UniValue& params, bool fHelp)
             HelpRequiringPassphrase() + "\n"
 
             "\nArguments:\n"
-            "1. amount      (numeric, required) Enter an amount of Zcr to convert to zMASTER\n"
+            "1. amount      (numeric, required) Enter an amount of Master to convert to zMASTER\n"
             "2. utxos       (string, optional) A json array of objects.\n"
             "                   Each object needs the txid (string) and vout (numeric)\n"
             "  [\n"
diff --git a/src/secp256k1/autom4te.cache/output.0 b/src/secp256k1/autom4te.cache/output.0
index 9ea1051..ed251c2 100644
--- a/src/secp256k1/autom4te.cache/output.0
+++ b/src/secp256k1/autom4te.cache/output.0
@@ -9170,7 +9170,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9182,7 +9182,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -10025,7 +10025,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -10037,7 +10037,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
diff --git a/src/secp256k1/autom4te.cache/output.1 b/src/secp256k1/autom4te.cache/output.1
index 9ea1051..ed251c2 100644
--- a/src/secp256k1/autom4te.cache/output.1
+++ b/src/secp256k1/autom4te.cache/output.1
@@ -9170,7 +9170,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9182,7 +9182,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -10025,7 +10025,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -10037,7 +10037,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
diff --git a/src/secp256k1/build-aux/m4/libtool.m4 b/src/secp256k1/build-aux/m4/libtool.m4
index ee80844..ab0cd5f 100644
--- a/src/secp256k1/build-aux/m4/libtool.m4
+++ b/src/secp256k1/build-aux/m4/libtool.m4
@@ -5157,7 +5157,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5169,7 +5169,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5863,7 +5863,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5875,7 +5875,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6732,7 +6732,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -6744,7 +6744,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
diff --git a/src/secp256k1/configure b/src/secp256k1/configure
index a3c0ec3..d342233 100644
--- a/src/secp256k1/configure
+++ b/src/secp256k1/configure
@@ -9170,7 +9170,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9182,7 +9182,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -10025,7 +10025,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -10037,7 +10037,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp
index f4aa7e8..d30c20f 100644
--- a/src/stakeinput.cpp
+++ b/src/stakeinput.cpp
@@ -165,31 +165,31 @@ bool CZMasterStake::MarkSpent(CWallet *pwallet, const uint256& txid)
 }
 
 //!MASTERStake
-bool CZcrStake::SetInput(CTransaction txPrev, unsigned int n)
+bool CMasterStake::SetInput(CTransaction txPrev, unsigned int n)
 {
     this->txFrom = txPrev;
     this->nPosition = n;
     return true;
 }
 
-bool CZcrStake::GetTxFrom(CTransaction& tx)
+bool CMasterStake::GetTxFrom(CTransaction& tx)
 {
     tx = txFrom;
     return true;
 }
 
-bool CZcrStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)
+bool CMasterStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)
 {
     txIn = CTxIn(txFrom.GetHash(), nPosition);
     return true;
 }
 
-CAmount CZcrStake::GetValue()
+CAmount CMasterStake::GetValue()
 {
     return txFrom.vout[nPosition].nValue;
 }
 
-bool CZcrStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)
+bool CMasterStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTotal)
 {
     vector<valtype> vSolutions;
     txnouttype whichType;
@@ -224,7 +224,7 @@ bool CZcrStake::CreateTxOuts(CWallet* pwallet, vector<CTxOut>& vout, CAmount nTo
     return true;
 }
 
-bool CZcrStake::GetModifier(uint64_t& nStakeModifier)
+bool CMasterStake::GetModifier(uint64_t& nStakeModifier)
 {
     int nStakeModifierHeight = 0;
     int64_t nStakeModifierTime = 0;
@@ -238,7 +238,7 @@ bool CZcrStake::GetModifier(uint64_t& nStakeModifier)
     return true;
 }
 
-CDataStream CZcrStake::GetUniqueness()
+CDataStream CMasterStake::GetUniqueness()
 {
     //The unique identifier for a MASTERstake is the outpoint
     CDataStream ss(SER_NETWORK, 0);
@@ -247,7 +247,7 @@ CDataStream CZcrStake::GetUniqueness()
 }
 
 //The block that the UTXO was added to the chain
-CBlockIndex* CZcrStake::GetIndexFrom()
+CBlockIndex* CMasterStake::GetIndexFrom()
 {
     uint256 hashBlock = 0;
     CTransaction tx;
diff --git a/src/stakeinput.h b/src/stakeinput.h
index 637832b..ed426bf 100644
--- a/src/stakeinput.h
+++ b/src/stakeinput.h
@@ -63,13 +63,13 @@ class CZMasterStake : public CStakeInput
     uint32_t GetChecksum();
 };
 
-class CZcrStake : public CStakeInput
+class CMasterStake : public CStakeInput
 {
 private:
     CTransaction txFrom;
     unsigned int nPosition;
 public:
-    CZcrStake()
+    CMasterStake()
     {
         this->pindexFrom = nullptr;
     }
diff --git a/src/univalue/autom4te.cache/output.0 b/src/univalue/autom4te.cache/output.0
index 5d97f95..84519fe 100644
--- a/src/univalue/autom4te.cache/output.0
+++ b/src/univalue/autom4te.cache/output.0
@@ -9088,7 +9088,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9100,7 +9100,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -9943,7 +9943,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9955,7 +9955,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -13238,7 +13238,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -13250,7 +13250,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/src/univalue/autom4te.cache/output.1 b/src/univalue/autom4te.cache/output.1
index 5d97f95..84519fe 100644
--- a/src/univalue/autom4te.cache/output.1
+++ b/src/univalue/autom4te.cache/output.1
@@ -9088,7 +9088,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9100,7 +9100,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -9943,7 +9943,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9955,7 +9955,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -13238,7 +13238,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -13250,7 +13250,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/src/univalue/build-aux/m4/libtool.m4 b/src/univalue/build-aux/m4/libtool.m4
index ee80844..ab0cd5f 100644
--- a/src/univalue/build-aux/m4/libtool.m4
+++ b/src/univalue/build-aux/m4/libtool.m4
@@ -5157,7 +5157,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5169,7 +5169,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5863,7 +5863,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -5875,7 +5875,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6732,7 +6732,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -6744,7 +6744,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
diff --git a/src/univalue/configure b/src/univalue/configure
index e5778a9..1fb1d72 100644
--- a/src/univalue/configure
+++ b/src/univalue/configure
@@ -9088,7 +9088,7 @@ _LT_EOF
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9100,7 +9100,7 @@ _LT_EOF
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -9943,7 +9943,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -9955,7 +9955,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	$CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
@@ -13238,7 +13238,7 @@ fi
 	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	  $ECHO EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
@@ -13250,7 +13250,7 @@ fi
 	  fi~
 	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  $CC -Zdll -Mastertdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
diff --git a/src/version.h b/src/version.h
index 5f24a1e..e1d9909 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70924;
+static const int PROTOCOL_VERSION = 70925;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -20,11 +20,11 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70923;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70924;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70924;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70925;
 
 //! masternodes older than this proto version use old strMessage format for mnannounce
-static const int MIN_PEER_MNANNOUNCE = 70921;
+static const int MIN_PEER_MNANNOUNCE = 70924;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 5f38126..1d0440c 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -54,7 +54,7 @@ bool fPayAtLeastCustomFee = true;
 int64_t nStartupTime = GetTime(); //!< Client startup time for use with automint
 
 /**
- * Fees smaller than this (in uzcr) are considered zero fee (for transaction creation)
+ * Fees smaller than this (in umaster) are considered zero fee (for transaction creation)
  * We are ~100 times smaller then bitcoin now (2015-06-23), set minTxFee 10 times higher
  * so it's still 10 times lower comparing to bitcoin.
  * Override with -mintxfee
@@ -2088,7 +2088,7 @@ bool CWallet::SelectStakeCoins(std::list<std::unique_ptr<CStakeInput> >& listInp
     vector<COutput> vCoins;
     AvailableCoins(vCoins, true, NULL, false, STAKABLE_COINS);
     CAmount nAmountSelected = 0;
-    if (GetBoolArg("-zcrstake", true)) {
+    if (GetBoolArg("-masterstake", true)) {
         for (const COutput &out : vCoins) {
             //make sure not to outrun target amount
             if (nAmountSelected + out.tx->vout[out.i].nValue > nTargetAmount)
@@ -2113,7 +2113,7 @@ bool CWallet::SelectStakeCoins(std::list<std::unique_ptr<CStakeInput> >& listInp
             //add to our stake set
             nAmountSelected += out.tx->vout[out.i].nValue;
 
-            std::unique_ptr<CZcrStake> input(new CZcrStake());
+            std::unique_ptr<CMasterStake> input(new CMasterStake());
             input->SetInput((CTransaction) *out.tx, out.i);
             listInputs.emplace_back(std::move(input));
         }
@@ -2156,7 +2156,7 @@ bool CWallet::MintableCoins()
 {
     LOCK(cs_main);
     CAmount nBalance = GetBalance();
-    CAmount nZzcrBalance = GetZerocoinBalance(false);
+    CAmount nZmasterBalance = GetZerocoinBalance(false);
 
     if (nBalance > 0) {
         if (mapArgs.count("-reservebalance") && !ParseMoney(mapArgs["-reservebalance"], nReserveBalance))
@@ -2181,7 +2181,7 @@ bool CWallet::MintableCoins()
     }
 
     // zMASTER
-    if (nZzcrBalance > 0) {
+    if (nZmasterBalance > 0) {
         set<CMintMeta> setMints = zmasterTracker->ListMints(true, true, true);
         for (auto mint : setMints) {
             if (mint.nVersion < CZerocoinMint::STAKABLE_VERSION)
@@ -4539,7 +4539,7 @@ bool CWallet::CreateZerocoinMintTransaction(const CAmount nValue, CMutableTransa
     }
 
     //any change that is less than 0.0100000 will be ignored and given as an extra fee
-    //also assume that a zerocoinspend that is minting the change will not have any change that goes to Zcr
+    //also assume that a zerocoinspend that is minting the change will not have any change that goes to Master
     CAmount nChange = nValueIn - nTotalValue; // Fee already accounted for in nTotalValue
     if (nChange > 1 * CENT && !isZCSpendChange) {
         // Fill a vout to ourself using the largest contributing address
diff --git a/src/zmastertracker.cpp b/src/zmastertracker.cpp
index 7d0b0eb..199ab37 100644
--- a/src/zmastertracker.cpp
+++ b/src/zmastertracker.cpp
@@ -133,7 +133,7 @@ CAmount CzMASTERTracker::GetBalance(bool fConfirmedOnly, bool fUnconfirmedOnly)
     }
 
     {
-        //LOCK(cs_zcrtracker);
+        //LOCK(cs_mastertracker);
         // Get Unused coins
         for (auto& it : mapSerialHashes) {
             CMintMeta meta = it.second;