diff --git a/tackerclient/shell.py b/tackerclient/shell.py
index 93fbb5b2..8b3fd8d3 100644
--- a/tackerclient/shell.py
+++ b/tackerclient/shell.py
@@ -50,8 +50,8 @@ from tackerclient.tacker.v1_0 import extension
 from tackerclient.tacker.v1_0.nfvo import vim
 from tackerclient.tacker.v1_0.nfvo import vnffg
 from tackerclient.tacker.v1_0.nfvo import vnffgd
-from tackerclient.tacker.v1_0.vm import vnf
-from tackerclient.tacker.v1_0.vm import vnfd
+from tackerclient.tacker.v1_0.vnfm import vnf
+from tackerclient.tacker.v1_0.vnfm import vnfd
 from tackerclient.version import __version__
 
 
diff --git a/tackerclient/tacker/v1_0/vm/__init__.py b/tackerclient/tacker/v1_0/vnfm/__init__.py
similarity index 100%
rename from tackerclient/tacker/v1_0/vm/__init__.py
rename to tackerclient/tacker/v1_0/vnfm/__init__.py
diff --git a/tackerclient/tacker/v1_0/vm/vnf.py b/tackerclient/tacker/v1_0/vnfm/vnf.py
similarity index 100%
rename from tackerclient/tacker/v1_0/vm/vnf.py
rename to tackerclient/tacker/v1_0/vnfm/vnf.py
diff --git a/tackerclient/tacker/v1_0/vm/vnfd.py b/tackerclient/tacker/v1_0/vnfm/vnfd.py
similarity index 100%
rename from tackerclient/tacker/v1_0/vm/vnfd.py
rename to tackerclient/tacker/v1_0/vnfm/vnfd.py
diff --git a/tackerclient/tests/unit/vm/test_cli10_vnf.py b/tackerclient/tests/unit/vm/test_cli10_vnf.py
index e4b04f62..cae7b94b 100644
--- a/tackerclient/tests/unit/vm/test_cli10_vnf.py
+++ b/tackerclient/tests/unit/vm/test_cli10_vnf.py
@@ -20,7 +20,7 @@ import sys
 
 from tackerclient import shell
 from tackerclient.tacker import v1_0 as tackerV1_0
-from tackerclient.tacker.v1_0.vm import vnf
+from tackerclient.tacker.v1_0.vnfm import vnf
 from tackerclient.tests.unit import test_cli10
 
 API_VERSION = "1.0"
diff --git a/tackerclient/tests/unit/vm/test_cli10_vnfd.py b/tackerclient/tests/unit/vm/test_cli10_vnfd.py
index 6291302b..5b1069f7 100644
--- a/tackerclient/tests/unit/vm/test_cli10_vnfd.py
+++ b/tackerclient/tests/unit/vm/test_cli10_vnfd.py
@@ -16,7 +16,7 @@
 
 import sys
 
-from tackerclient.tacker.v1_0.vm import vnfd
+from tackerclient.tacker.v1_0.vnfm import vnfd
 from tackerclient.tests.unit import test_cli10