diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index b4e8438b64..a13a3e0156 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -286,7 +286,7 @@ VM_MAD = [
 
 TM_MAD = [
     executable = "one_tm",
-    arguments  = "-t 15 -d dummy,lvm,shared,qcow2,ssh,vmware,iscsi" ]
+    arguments  = "-t 15 -d dummy,lvm,shared,qcow2,ssh,vmfs,iscsi" ]
 
 #*******************************************************************************
 # Datastore Driver Configuration
diff --git a/src/tm_mad/vmware/clone b/src/tm_mad/vmfs/clone
similarity index 100%
rename from src/tm_mad/vmware/clone
rename to src/tm_mad/vmfs/clone
diff --git a/src/tm_mad/vmware/context b/src/tm_mad/vmfs/context
similarity index 100%
rename from src/tm_mad/vmware/context
rename to src/tm_mad/vmfs/context
diff --git a/src/tm_mad/vmware/delete b/src/tm_mad/vmfs/delete
similarity index 100%
rename from src/tm_mad/vmware/delete
rename to src/tm_mad/vmfs/delete
diff --git a/src/tm_mad/vmware/ln b/src/tm_mad/vmfs/ln
similarity index 100%
rename from src/tm_mad/vmware/ln
rename to src/tm_mad/vmfs/ln
diff --git a/src/tm_mad/vmware/mkimage b/src/tm_mad/vmfs/mkimage
similarity index 100%
rename from src/tm_mad/vmware/mkimage
rename to src/tm_mad/vmfs/mkimage
diff --git a/src/tm_mad/vmware/mkswap b/src/tm_mad/vmfs/mkswap
similarity index 100%
rename from src/tm_mad/vmware/mkswap
rename to src/tm_mad/vmfs/mkswap
diff --git a/src/tm_mad/vmware/mv b/src/tm_mad/vmfs/mv
similarity index 100%
rename from src/tm_mad/vmware/mv
rename to src/tm_mad/vmfs/mv
diff --git a/src/tm_mad/vmware/mvds b/src/tm_mad/vmfs/mvds
similarity index 100%
rename from src/tm_mad/vmware/mvds
rename to src/tm_mad/vmfs/mvds
diff --git a/src/tm_mad/vmware/tm_vmwarerc b/src/tm_mad/vmfs/tm_vmfsrc
similarity index 100%
rename from src/tm_mad/vmware/tm_vmwarerc
rename to src/tm_mad/vmfs/tm_vmfsrc