diff --git a/.travis.yml b/.travis.yml
index fa19e6b..853525e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,6 +122,7 @@
   - mkdir -p repos && pushd repos/
   - git clone --depth=1 https://github.com/apache/mynewt-core apache-mynewt-core
   - git clone --depth=1 https://github.com/JuulLabs-OSS/mcuboot mcuboot
+  - git clone --depth=1 https://github.com/apache/mynewt-mcumgr apache-mynewt-mcumgr
   - popd
 
 script:
diff --git a/apps/blemesh/syscfg.yml b/apps/blemesh/syscfg.yml
index 21471a2..a217833 100644
--- a/apps/blemesh/syscfg.yml
+++ b/apps/blemesh/syscfg.yml
@@ -26,8 +26,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 768
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # MCUmgr SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
     BLE_MESH: 1
     MSYS_1_BLOCK_COUNT: 48
diff --git a/apps/blemesh_light/syscfg.yml b/apps/blemesh_light/syscfg.yml
index d537b34..82c70dc 100644
--- a/apps/blemesh_light/syscfg.yml
+++ b/apps/blemesh_light/syscfg.yml
@@ -30,8 +30,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 768
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
     MSYS_1_BLOCK_COUNT: 80
 
diff --git a/apps/blemesh_models_example_1/syscfg.yml b/apps/blemesh_models_example_1/syscfg.yml
index d75e0de..d1cdaa5 100644
--- a/apps/blemesh_models_example_1/syscfg.yml
+++ b/apps/blemesh_models_example_1/syscfg.yml
@@ -23,8 +23,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 768
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
     MSYS_1_BLOCK_COUNT: 48
 
diff --git a/apps/blemesh_models_example_2/syscfg.yml b/apps/blemesh_models_example_2/syscfg.yml
index bff8049..8a9e823 100644
--- a/apps/blemesh_models_example_2/syscfg.yml
+++ b/apps/blemesh_models_example_2/syscfg.yml
@@ -23,8 +23,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 4096
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
     MSYS_1_BLOCK_COUNT: 48
 
diff --git a/apps/blemesh_shell/syscfg.yml b/apps/blemesh_shell/syscfg.yml
index 0065583..658a9f1 100644
--- a/apps/blemesh_shell/syscfg.yml
+++ b/apps/blemesh_shell/syscfg.yml
@@ -26,8 +26,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 768
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
     MSYS_1_BLOCK_COUNT: 80
 
diff --git a/apps/bleprph/pkg.yml b/apps/bleprph/pkg.yml
index 844c99a..38b6e44 100644
--- a/apps/bleprph/pkg.yml
+++ b/apps/bleprph/pkg.yml
@@ -27,8 +27,8 @@
     - "@mcuboot/boot/bootutil"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/mgmt/imgmgr"
-    - "@apache-mynewt-core/mgmt/newtmgr"
-    - "@apache-mynewt-core/mgmt/newtmgr/transport/ble"
+    - "@apache-mynewt-core/mgmt/smp"
+    - "@apache-mynewt-core/mgmt/smp/transport/ble"
     - "@apache-mynewt-core/sys/console/full"
     - "@apache-mynewt-core/sys/log/full"
     - "@apache-mynewt-core/sys/log/modlog"
diff --git a/apps/bleprph/syscfg.yml b/apps/bleprph/syscfg.yml
index 7256243..56a5083 100644
--- a/apps/bleprph/syscfg.yml
+++ b/apps/bleprph/syscfg.yml
@@ -52,15 +52,15 @@
     LOG_FCB: 1
     CONFIG_FCB: 1
 
-    # Enable newtmgr commands.
-    STATS_NEWTMGR: 1
-    LOG_NEWTMGR: 1
-    CONFIG_NEWTMGR: 1
+    # Enable smp commands.
+    STATS_MGMT: 1
+    LOG_MGMT: 1
+    CONFIG_MGMT: 1
 
     # OS main/default task
     OS_MAIN_STACK_SIZE: 468
 
-    # Lots of smaller mbufs are required for newtmgr using typical BLE ATT MTU
+    # Lots of smaller mbufs are required for smp using typical BLE ATT MTU
     # values.
     MSYS_1_BLOCK_COUNT: 22
     MSYS_1_BLOCK_SIZE: 110
diff --git a/apps/btshell/syscfg.yml b/apps/btshell/syscfg.yml
index b74a52d..9ebf9d8 100644
--- a/apps/btshell/syscfg.yml
+++ b/apps/btshell/syscfg.yml
@@ -35,8 +35,8 @@
     # Default task settings
     OS_MAIN_STACK_SIZE: 512
 
-    # Newtmgr is not supported in this app, so disable newtmgr-over-shell.
-    SHELL_NEWTMGR: 0
+    # SMP is not supported in this app, so disable smp-over-shell.
+    SHELL_MGMT: 0
 
 syscfg.vals.BLE_MESH:
     MSYS_1_BLOCK_COUNT: 16