diff --git a/buildUtil/build.xml b/buildUtil/build.xml
index c25b90fab85..2a8714cddca 100644
--- a/buildUtil/build.xml
+++ b/buildUtil/build.xml
@@ -8,7 +8,7 @@
   <property name="dmg.image" value="../rcp/icons/mbeddr-logo.png"/>
 
   <property name="build.tmp" value="./"/>
-  <property name="build.code" value="mbeddr-macos"/>
+  <property name="build.artifact" value="mbeddr"/>
 	
 
 <target name="get-jdk">
@@ -22,11 +22,11 @@
 
 
 <target name="macbuild">
-  <copy file="${dmg.image}" tofile="${build.tmp}/${build.code}.png"/>
+  <copy file="${dmg.image}" tofile="${build.tmp}/${build.artifact}-macos.png"/>
 
-  <exec dir="${build.tmp}" command="./mpssign.sh ${build.code}.zip ${build.code} jdk.tar.gz"/>
+  <exec dir="${build.tmp}" command="./mpssign.sh ${build.artifact}-macos.zip ${build.artifact}-macos jdk.tar.gz"/>
 
-  <exec dir="${build.tmp}" command="./mpsdmg.sh ${build.code}.zip ${build.code}"/>
+  <exec dir="${build.tmp}" command="./mpsdmg.sh ${build.artifact}-macos.zip ${build.artifact}-macos"/>
 </target>
 
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/models/com/mbeddr/rcp/config.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/models/com/mbeddr/rcp/config.mps
index 8f60d5426f3..25b78d04888 100755
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/models/com/mbeddr/rcp/config.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/models/com/mbeddr/rcp/config.mps
@@ -2229,7 +2229,7 @@
                 <property role="2$htvj" value="*" />
                 <node concept="NbPM2" id="6xv$4WsFw_3" role="2$htvi">
                   <node concept="3Mxwew" id="6xv$4WsFw_4" role="3MwsjC">
-                    <property role="3MwjfP" value="mps.exe.vmoptions" />
+                    <property role="3MwjfP" value="mbeddr.exe.vmoptions" />
                   </node>
                 </node>
               </node>
@@ -2248,7 +2248,7 @@
                 <property role="2$htvj" value="*" />
                 <node concept="NbPM2" id="2lwFGYPkEdq" role="2$htvi">
                   <node concept="3Mxwew" id="2lwFGYPkEdr" role="3MwsjC">
-                    <property role="3MwjfP" value="mps64.exe.vmoptions" />
+                    <property role="3MwjfP" value="mbeddr64.exe.vmoptions" />
                   </node>
                 </node>
               </node>