diff --git a/build-template/build.sh b/build-template/build.sh
index b07295c81b..c8cc2a72e1 100644
--- a/build-template/build.sh
+++ b/build-template/build.sh
@@ -27,11 +27,11 @@ if test ! -d packages/KoreBuild; then
     mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
 fi
 
-if ! type k > /dev/null 2>&1; then
+if ! type dnvm > /dev/null 2>&1; then
     source packages/KoreBuild/build/dnvm.sh
 fi
 
-if ! type k > /dev/null 2>&1; then
+if ! type dnx > /dev/null 2>&1; then
     dnvm upgrade
 fi
 
diff --git a/build.sh b/build.sh
index b07295c81b..c8cc2a72e1 100755
--- a/build.sh
+++ b/build.sh
@@ -27,11 +27,11 @@ if test ! -d packages/KoreBuild; then
     mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
 fi
 
-if ! type k > /dev/null 2>&1; then
+if ! type dnvm > /dev/null 2>&1; then
     source packages/KoreBuild/build/dnvm.sh
 fi
 
-if ! type k > /dev/null 2>&1; then
+if ! type dnx > /dev/null 2>&1; then
     dnvm upgrade
 fi
 
diff --git a/build/_k.shade b/build/_k.shade
index 8fd7e10e5b..f4fd43cb6c 100644
--- a/build/_k.shade
+++ b/build/_k.shade
@@ -1,7 +1,7 @@
 @{/*
 
 k 
-    Run klr commands in your project. Executes k cmd.
+    Run dnx commands in your project. Executes dnx cmd.
 
 command=''
 dnvmUse=''
@@ -12,6 +12,6 @@ default dnvmUse=''
 
 var dnvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\dnvm'
 
-exec program='cmd' commandline='/C k ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)'
-exec program='cmd' commandline='/C "${dnvmPath}" use ${dnvmUse} && k ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)'
-exec program='k' commandline='${command}' if='IsMono'
+exec program='cmd' commandline='/C dnx . ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)'
+exec program='cmd' commandline='/C "${dnvmPath}" use ${dnvmUse} && dnx . ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)'
+exec program='dnx' commandline='. ${command}' if='IsMono'