diff --git a/README.markdown b/README.markdown
index 1cad7e3..25936c3 100644
--- a/README.markdown
+++ b/README.markdown
@@ -41,7 +41,7 @@ Manage Virtual machine
 
 You may launch a new instance and install puppet agent with this module installed using the following single command:
 
-    $puppet node_azure create --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id \
+    $puppet azure_vm create --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id \
     --image b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-13_04-amd64-server-20130501-en-us-30GB --location 'west us' 
     --vm-name vmname --vm-user username --password ComplexPassword  --puppet-master-ip 198.62.195.5
 
@@ -61,14 +61,14 @@ Other avaliable actions are
 
 To list all options for any action
 
-    $puppet help node_azure ACTION-NAME
+    $puppet help azure_vm ACTION-NAME
 
 Manage Virtual Network
 ========================
 
 Creating virtual network
 
-    $puppet virtual_network set --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id
+    $puppet azure_vnet set --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id
     --virtual-network-name vnetname --affinity-group-name ag-name --address-space '172.16.0.0/12,192.168.0.0/16'
     --dns-servers 'dns1-1:10.10.8.8,dns2:172.8.4.4' --subnets 'subnet-1:172.16.0.0:12,subnet-2:192.168.0.0:29'
 
@@ -83,7 +83,7 @@ Manage SQL database server
 
 Creating SQL database server
 
-    $puppet database_server create --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id \
+    $puppet azure_sqldb create --management-certificate pem-or-pfx-file-path --azure-subscription-id=your-subscription-id \
     --management-endpoint=https://management.database.windows.net:8443/ --login loginname --password ComplexPassword --location 'West Us'
 
 Other avaliable actions are
diff --git a/lib/puppet/affinity_group.rb b/lib/puppet/affinity_group.rb
index 2f5f1c4..51395fc 100644
--- a/lib/puppet/affinity_group.rb
+++ b/lib/puppet/affinity_group.rb
@@ -21,7 +21,7 @@ module Puppet::AffinityGroup
 
   class << self
     def views(name)
-      File.join(File.dirname(__FILE__), 'face/azure_affinity_group/views', name)
+      File.join(File.dirname(__FILE__), 'face/azure_affinitygroup/views', name)
     end
 
     def add_create_options(action)
diff --git a/lib/puppet/application/azure_affinity_group.rb b/lib/puppet/application/azure_affinitygroup.rb
similarity index 92%
rename from lib/puppet/application/azure_affinity_group.rb
rename to lib/puppet/application/azure_affinitygroup.rb
index a43ff1a..357a6e5 100644
--- a/lib/puppet/application/azure_affinity_group.rb
+++ b/lib/puppet/application/azure_affinitygroup.rb
@@ -15,5 +15,5 @@
 require 'puppet/face'
 require 'puppet/application/face_base'
 
-class Puppet::Application::AzureAffinityGroup < Puppet::Application::FaceBase
+class Puppet::Application::AzureAffinitygroup < Puppet::Application::FaceBase
 end
diff --git a/lib/puppet/application/database_server.rb b/lib/puppet/application/azure_sqldb.rb
similarity index 91%
rename from lib/puppet/application/database_server.rb
rename to lib/puppet/application/azure_sqldb.rb
index 21ad732..7bf3620 100644
--- a/lib/puppet/application/database_server.rb
+++ b/lib/puppet/application/azure_sqldb.rb
@@ -14,5 +14,5 @@
 #--------------------------------------------------------------------------
 require 'puppet/application/face_base'
 
-class Puppet::Application::DatabaseServer < Puppet::Application::FaceBase
+class Puppet::Application::AzureSqldb < Puppet::Application::FaceBase
 end
diff --git a/lib/puppet/application/virtual_network.rb b/lib/puppet/application/azure_vm.rb
similarity index 91%
rename from lib/puppet/application/virtual_network.rb
rename to lib/puppet/application/azure_vm.rb
index 20509b2..48cfb1d 100644
--- a/lib/puppet/application/virtual_network.rb
+++ b/lib/puppet/application/azure_vm.rb
@@ -14,5 +14,5 @@
 #--------------------------------------------------------------------------
 require 'puppet/application/face_base'
 
-class Puppet::Application::VirtualNetwork < Puppet::Application::FaceBase
+class Puppet::Application::AzureVm < Puppet::Application::FaceBase
 end
diff --git a/lib/puppet/application/node_azure.rb b/lib/puppet/application/azure_vnet.rb
similarity index 92%
rename from lib/puppet/application/node_azure.rb
rename to lib/puppet/application/azure_vnet.rb
index 39ffb36..cf8f671 100644
--- a/lib/puppet/application/node_azure.rb
+++ b/lib/puppet/application/azure_vnet.rb
@@ -14,5 +14,5 @@
 #--------------------------------------------------------------------------
 require 'puppet/application/face_base'
 
-class Puppet::Application::NodeAzure < Puppet::Application::FaceBase
+class Puppet::Application::AzureVnet < Puppet::Application::FaceBase
 end
diff --git a/lib/puppet/face/azure_affinity_group.rb b/lib/puppet/face/azure_affinitygroup.rb
similarity index 88%
rename from lib/puppet/face/azure_affinity_group.rb
rename to lib/puppet/face/azure_affinitygroup.rb
index 6f56ece..441308a 100644
--- a/lib/puppet/face/azure_affinity_group.rb
+++ b/lib/puppet/face/azure_affinitygroup.rb
@@ -1,6 +1,6 @@
 require 'puppet/affinity_group'
 
-Puppet::Face.define(:azure_affinity_group, '0.0.1') do
+Puppet::Face.define(:azure_affinitygroup, '0.0.1') do
   copyright "Windows Azure", 2013
   license   "Microsoft Open Technologies, Inc; see COPYING"
 
diff --git a/lib/puppet/face/azure_affinity_group/create.rb b/lib/puppet/face/azure_affinitygroup/create.rb
similarity index 91%
rename from lib/puppet/face/azure_affinity_group/create.rb
rename to lib/puppet/face/azure_affinitygroup/create.rb
index 58ae75f..7f76daf 100644
--- a/lib/puppet/face/azure_affinity_group/create.rb
+++ b/lib/puppet/face/azure_affinitygroup/create.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :azure_affinity_group, '0.0.1' do
+Puppet::Face.define :azure_affinitygroup, '0.0.1' do
   action :create do
 
     summary 'Create affinity group.'
@@ -36,7 +36,7 @@ Puppet::Face.define :azure_affinity_group, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet azure_affinity_group create --management-certificate path-to-azure-certificate \
+      $ puppet azure_affinitygroup create --management-certificate path-to-azure-certificate \
         --azure-subscription-id YOUR-SUBSCRIPTION-ID --location 'West Us' --label aglabel\
         --affinity-group-name agname --description 'Some Description'
     EOT
diff --git a/lib/puppet/face/azure_affinity_group/delete.rb b/lib/puppet/face/azure_affinitygroup/delete.rb
similarity index 90%
rename from lib/puppet/face/azure_affinity_group/delete.rb
rename to lib/puppet/face/azure_affinitygroup/delete.rb
index 68e6b19..e97b008 100644
--- a/lib/puppet/face/azure_affinity_group/delete.rb
+++ b/lib/puppet/face/azure_affinitygroup/delete.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :azure_affinity_group, '0.0.1' do
+Puppet::Face.define :azure_affinitygroup, '0.0.1' do
   action :delete   do
 
     summary 'Delete affinity group.'
@@ -35,7 +35,7 @@ Puppet::Face.define :azure_affinity_group, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet azure_affinity_group delete --management-certificate path-to-azure-certificate \
+      $ puppet azure_affinitygroup delete --management-certificate path-to-azure-certificate \
         --azure-subscription-id YOUR-SUBSCRIPTION-ID --affinity-group-name ag-name
     EOT
   end
diff --git a/lib/puppet/face/azure_affinity_group/list.rb b/lib/puppet/face/azure_affinitygroup/list.rb
similarity index 96%
rename from lib/puppet/face/azure_affinity_group/list.rb
rename to lib/puppet/face/azure_affinitygroup/list.rb
index 0382861..e2640e0 100644
--- a/lib/puppet/face/azure_affinity_group/list.rb
+++ b/lib/puppet/face/azure_affinitygroup/list.rb
@@ -1,4 +1,4 @@
-Puppet::Face.define :azure_affinity_group, '0.0.1' do
+Puppet::Face.define :azure_affinitygroup, '0.0.1' do
   action :list do
 
     summary 'List affinity groups.'
diff --git a/lib/puppet/face/azure_affinity_group/update.rb b/lib/puppet/face/azure_affinitygroup/update.rb
similarity index 83%
rename from lib/puppet/face/azure_affinity_group/update.rb
rename to lib/puppet/face/azure_affinitygroup/update.rb
index 4401d4a..f2801ef 100644
--- a/lib/puppet/face/azure_affinity_group/update.rb
+++ b/lib/puppet/face/azure_affinitygroup/update.rb
@@ -1,4 +1,4 @@
-Puppet::Face.define :azure_affinity_group, '0.0.1' do
+Puppet::Face.define :azure_affinitygroup, '0.0.1' do
   action :update do
 
     summary 'Update affinity group.'
@@ -21,7 +21,7 @@ Puppet::Face.define :azure_affinity_group, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet azure_affinity_group update --management-certificate path-to-azure-certificate \
+      $ puppet azure_affinitygroup update --management-certificate path-to-azure-certificate \
         --azure-subscription-id YOUR-SUBSCRIPTION-ID --label aglabel \
         --affinity-group-name agname --description 'Some Description'
     EOT
diff --git a/lib/puppet/face/azure_affinity_group/views/affinity_groups.erb b/lib/puppet/face/azure_affinitygroup/views/affinity_groups.erb
similarity index 100%
rename from lib/puppet/face/azure_affinity_group/views/affinity_groups.erb
rename to lib/puppet/face/azure_affinitygroup/views/affinity_groups.erb
diff --git a/lib/puppet/face/database_server.rb b/lib/puppet/face/azure_sqldb.rb
similarity index 95%
rename from lib/puppet/face/database_server.rb
rename to lib/puppet/face/azure_sqldb.rb
index 8fb8fcb..828fd8d 100644
--- a/lib/puppet/face/database_server.rb
+++ b/lib/puppet/face/azure_sqldb.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'puppet/sql_database'
 
-Puppet::Face.define(:database_server, '0.0.1') do
+Puppet::Face.define(:azure_sqldb, '0.0.1') do
   copyright "Windows Azure", 2013
   license   "Microsoft Open Technologies, Inc; see COPYING"
 
diff --git a/lib/puppet/face/database_server/create.rb b/lib/puppet/face/azure_sqldb/create.rb
similarity index 91%
rename from lib/puppet/face/database_server/create.rb
rename to lib/puppet/face/azure_sqldb/create.rb
index 8da60f8..8bf7577 100644
--- a/lib/puppet/face/database_server/create.rb
+++ b/lib/puppet/face/azure_sqldb/create.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :create do
 
     summary 'Create SQL database server.'
@@ -32,7 +32,7 @@ Puppet::Face.define :database_server, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet database_server create --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_sqldb create --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=ABCD1234 --login puppet --location 'West Us'\
         --management-endpoint=https://management.database.windows.net:8443/ --password Ranjan@123
     EOT
diff --git a/lib/puppet/face/database_server/create_firewall.rb b/lib/puppet/face/azure_sqldb/create_firewall.rb
similarity index 87%
rename from lib/puppet/face/database_server/create_firewall.rb
rename to lib/puppet/face/azure_sqldb/create_firewall.rb
index 8e3511c..fd99b6a 100644
--- a/lib/puppet/face/database_server/create_firewall.rb
+++ b/lib/puppet/face/azure_sqldb/create_firewall.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :create_firewall do
 
     summary 'Create SQL database server.'
@@ -32,11 +32,11 @@ Puppet::Face.define :database_server, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet database_server create_firewall --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_sqldb create_firewall --management-certificate ~/exp/azuremanagement.pem\
  --azure-subscription-id=ID --management-endpoint=https://management.database.windows.net:8443/\
  --server-name=g2jxhsbk0w --rule-name ranjan --start-ip-address 10.10.0.0 --end-ip-address 10.10.0.255
 
-      $ puppet database_server create_firewall --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_sqldb create_firewall --management-certificate ~/exp/azuremanagement.pem\
  --azure-subscription-id=ID --management-endpoint=https://management.database.windows.net:8443/\
  --server-name=g2jxhsbk0w --rule-name ranjan
     EOT
diff --git a/lib/puppet/face/database_server/delete.rb b/lib/puppet/face/azure_sqldb/delete.rb
similarity index 90%
rename from lib/puppet/face/database_server/delete.rb
rename to lib/puppet/face/azure_sqldb/delete.rb
index 8ab4c48..987378b 100644
--- a/lib/puppet/face/database_server/delete.rb
+++ b/lib/puppet/face/azure_sqldb/delete.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :delete do
 
     summary 'Delete Windows Azure sql database server'
@@ -34,7 +34,7 @@ Puppet::Face.define :database_server, '0.0.1' do
     returns 'NONE'
 
     examples <<-'EOT'
-      $  puppet database_server delete --management-certificate ~/exp/azuremanagement.pem\
+      $  puppet azure_sqldb delete --management-certificate ~/exp/azuremanagement.pem\
          --azure-subscription-id=ABCD123 --server-name=ezprthvj9w\
          --management-endpoint=https://management.database.windows.net:8443/
     EOT
diff --git a/lib/puppet/face/database_server/delete_firewall.rb b/lib/puppet/face/azure_sqldb/delete_firewall.rb
similarity index 85%
rename from lib/puppet/face/database_server/delete_firewall.rb
rename to lib/puppet/face/azure_sqldb/delete_firewall.rb
index 0715f03..9f519ec 100644
--- a/lib/puppet/face/database_server/delete_firewall.rb
+++ b/lib/puppet/face/azure_sqldb/delete_firewall.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :delete_firewall do
 
     summary 'Delete Windows Azure sql database server firewall'
@@ -34,8 +34,8 @@ Puppet::Face.define :database_server, '0.0.1' do
     returns 'NONE'
 
     examples <<-'EOT'
-      $  puppet database_server delete --management-certificate ~/exp/azuremanagement.pem\
-         puppet database_server delete_firewall --management-certificate ~/exp/azuremanagement.pem\
+      $  puppet azure_sqldb delete --management-certificate ~/exp/azuremanagement.pem\
+         puppet azure_sqldb delete_firewall --management-certificate ~/exp/azuremanagement.pem\
          --azure-subscription-id=ID --management-endpoint=https://management.database.windows.net:8443/\
          --server-name=xlykw0su08 --rule-name rule1
     EOT
diff --git a/lib/puppet/face/database_server/list.rb b/lib/puppet/face/azure_sqldb/list.rb
similarity index 93%
rename from lib/puppet/face/database_server/list.rb
rename to lib/puppet/face/azure_sqldb/list.rb
index fabd328..b463678 100644
--- a/lib/puppet/face/database_server/list.rb
+++ b/lib/puppet/face/azure_sqldb/list.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'tilt'
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :list do
 
     summary 'List SQL database servers.'
@@ -37,7 +37,7 @@ Puppet::Face.define :database_server, '0.0.1' do
     returns 'Array of database server objets.'
 
     examples <<-'EOT'
-      $ puppet database_server list --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_sqldb list --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=368a3-dcd0-4cd3 --management-endpoint=https://management.database.windows.net:8443/
 
     Listing Servers
diff --git a/lib/puppet/face/database_server/list_firewall.rb b/lib/puppet/face/azure_sqldb/list_firewall.rb
similarity index 93%
rename from lib/puppet/face/database_server/list_firewall.rb
rename to lib/puppet/face/azure_sqldb/list_firewall.rb
index 0880286..d2853f1 100644
--- a/lib/puppet/face/database_server/list_firewall.rb
+++ b/lib/puppet/face/azure_sqldb/list_firewall.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'tilt'
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :list_firewall do
 
     summary 'List firewall of SQL database servers.'
@@ -35,7 +35,7 @@ Puppet::Face.define :database_server, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $  puppet database_server list_firewall --management-certificate ~/exp/azuremanagement.pem\
+      $  puppet azure_sqldb list_firewall --management-certificate ~/exp/azuremanagement.pem\
          --azure-subscription-id=ID --management-endpoint=https://management.database.windows.net:8443/\
          --server-name=g2jxhsbk0w
         Listing Firewall
diff --git a/lib/puppet/face/database_server/reset_password.rb b/lib/puppet/face/azure_sqldb/reset_password.rb
similarity index 90%
rename from lib/puppet/face/database_server/reset_password.rb
rename to lib/puppet/face/azure_sqldb/reset_password.rb
index ae50dbe..e408c38 100644
--- a/lib/puppet/face/database_server/reset_password.rb
+++ b/lib/puppet/face/azure_sqldb/reset_password.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :database_server, '0.0.1' do
+Puppet::Face.define :azure_sqldb, '0.0.1' do
   action :reset_password do
 
     summary 'Reset password of sql database server.'
@@ -32,7 +32,7 @@ Puppet::Face.define :database_server, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet database_server reset_password --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_sqldb reset_password --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=368a3762-fce0 --management-endpoint=https://management.database.windows.net:8443/\
         --server-name hc786mm0l8 --password Ranjan@1234
     EOT
diff --git a/lib/puppet/face/database_server/views/server_firewalls.erb b/lib/puppet/face/azure_sqldb/views/server_firewalls.erb
similarity index 100%
rename from lib/puppet/face/database_server/views/server_firewalls.erb
rename to lib/puppet/face/azure_sqldb/views/server_firewalls.erb
diff --git a/lib/puppet/face/database_server/views/servers.erb b/lib/puppet/face/azure_sqldb/views/servers.erb
similarity index 100%
rename from lib/puppet/face/database_server/views/servers.erb
rename to lib/puppet/face/azure_sqldb/views/servers.erb
diff --git a/lib/puppet/face/node_azure.rb b/lib/puppet/face/azure_vm.rb
similarity index 96%
rename from lib/puppet/face/node_azure.rb
rename to lib/puppet/face/azure_vm.rb
index b2b405c..4d0cd4a 100644
--- a/lib/puppet/face/node_azure.rb
+++ b/lib/puppet/face/azure_vm.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'puppet/virtual_machine'
 
-Puppet::Face.define(:node_azure, '0.0.1') do
+Puppet::Face.define(:azure_vm, '0.0.1') do
   copyright "Windows Azure", 2013
   license   "Microsoft Open Technologies, Inc; see COPYING"
 
diff --git a/lib/puppet/face/node_azure/bootstrap.rb b/lib/puppet/face/azure_vm/bootstrap.rb
similarity index 90%
rename from lib/puppet/face/node_azure/bootstrap.rb
rename to lib/puppet/face/azure_vm/bootstrap.rb
index 4bf9a18..fb9e84c 100644
--- a/lib/puppet/face/node_azure/bootstrap.rb
+++ b/lib/puppet/face/azure_vm/bootstrap.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'puppet/cloudpack/bootstrap'
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :bootstrap do
 
     summary 'Install puppet node on  Windows Azure VM'
@@ -31,7 +31,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet node_azure bootstrap --publish-settings-file=azuremanagement_pfx.publishsettings \
+      $ puppet azure_vm bootstrap --publish-settings-file=azuremanagement_pfx.publishsettings \
        --vm-user=username --puppet-master-ip=152.56.161.48 --password=Abcd123 \
        --node-ip-address=domain.cloudapp.net
     EOT
diff --git a/lib/puppet/face/node_azure/create.rb b/lib/puppet/face/azure_vm/create.rb
similarity index 95%
rename from lib/puppet/face/node_azure/create.rb
rename to lib/puppet/face/azure_vm/create.rb
index 56b949f..cc616fa 100644
--- a/lib/puppet/face/node_azure/create.rb
+++ b/lib/puppet/face/azure_vm/create.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :create do
 
     summary 'Create Windows Azure VM'
@@ -71,7 +71,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     end
 
     examples <<-'EOT'
-      $ puppet node_azure create --publish-settings-file azuremanagement.publishsettings --vm-name vmname\
+      $ puppet azure_vm create --publish-settings-file azuremanagement.publishsettings --vm-name vmname\
            --vm-user ranjan  --password Password!@12  --storage-account-name storageaccount1'\
            --image  b4590d9e3ed742e4a1d46e5424aa335e__SUSE-Linux-Enterprise-Server-11-SP2-Agent13\
            --cloud-service-name cloudname --subscription-id 2346a-fce0-4cd3-a4ea-80e84bddff87\
diff --git a/lib/puppet/face/node_azure/delete.rb b/lib/puppet/face/azure_vm/delete.rb
similarity index 91%
rename from lib/puppet/face/node_azure/delete.rb
rename to lib/puppet/face/azure_vm/delete.rb
index d82e4c3..20bb3aa 100644
--- a/lib/puppet/face/node_azure/delete.rb
+++ b/lib/puppet/face/azure_vm/delete.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :delete do
 
     summary 'Delete Windows Azure node instances'
@@ -34,7 +34,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'NONE'
 
     examples <<-'EOT'
-      $ puppet node_azure delete --publish-settings-file azuremanagement.publishsettings \
+      $ puppet azure_vm delete --publish-settings-file azuremanagement.publishsettings \
        --cloud-service-name service_name --vm-name name
 
     EOT
diff --git a/lib/puppet/face/node_azure/images.rb b/lib/puppet/face/azure_vm/images.rb
similarity index 91%
rename from lib/puppet/face/node_azure/images.rb
rename to lib/puppet/face/azure_vm/images.rb
index 088e0ff..b81f860 100644
--- a/lib/puppet/face/node_azure/images.rb
+++ b/lib/puppet/face/azure_vm/images.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'tilt'
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :images do
 
     summary 'List Windows Azure images'
@@ -36,7 +36,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'Array of attribute hashes containing information about each Azure images.'
 
     examples <<-'EOT'
-      $ puppet node_azure images --publish-settings-file azuremanagement.publishsettings --azure-subscription-id ID
+      $ puppet azure_vm images --publish-settings-file azuremanagement.publishsettings --azure-subscription-id ID
       OS Type      OS Nmae
       Windows :  2cdc6229df6344129ee553dd3499f0d3__BizTalk-Server-2013-Beta
       Windows :  2cdc6229df6344129ee553dd3499f0d3__BizTalk-Server-2013-Beta-February-2013
diff --git a/lib/puppet/face/node_azure/locations.rb b/lib/puppet/face/azure_vm/locations.rb
similarity index 93%
rename from lib/puppet/face/node_azure/locations.rb
rename to lib/puppet/face/azure_vm/locations.rb
index b3ff57f..c69d482 100644
--- a/lib/puppet/face/node_azure/locations.rb
+++ b/lib/puppet/face/azure_vm/locations.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'tilt'
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :locations do
 
     summary 'List Windows Azure locations'
@@ -36,7 +36,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'Array of attribute hashes containing information about each Azure locations.'
 
     examples <<-'EOT'
-      $ puppet node_azure locations --publish-settings-file azuremanagement.publishsettings
+      $ puppet azure_vm locations --publish-settings-file azuremanagement.publishsettings
       Location Name         Available Service
 
       West US :  Compute, Storage, PersistentVMRole
diff --git a/lib/puppet/face/node_azure/servers.rb b/lib/puppet/face/azure_vm/servers.rb
similarity index 91%
rename from lib/puppet/face/node_azure/servers.rb
rename to lib/puppet/face/azure_vm/servers.rb
index 749de49..d96e9b3 100644
--- a/lib/puppet/face/node_azure/servers.rb
+++ b/lib/puppet/face/azure_vm/servers.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'tilt'
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :servers do
 
     summary 'List Windows Azure node instances'
@@ -37,7 +37,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'Array of attribute hashes containing information about each Azure instance.'
 
     examples <<-'EOT'
-      $ puppet node_azure servers --publish-settings-file azuremanagement.publishsettings --azure-subscription-id ID
+      $ puppet azure_vm servers --publish-settings-file azuremanagement.publishsettings --azure-subscription-id ID
       Server: 1
         Service: cloudserver1
         Deployment:  deployment1
diff --git a/lib/puppet/face/node_azure/shutdown.rb b/lib/puppet/face/azure_vm/shutdown.rb
similarity index 91%
rename from lib/puppet/face/node_azure/shutdown.rb
rename to lib/puppet/face/azure_vm/shutdown.rb
index 7cfb520..1f39581 100644
--- a/lib/puppet/face/node_azure/shutdown.rb
+++ b/lib/puppet/face/azure_vm/shutdown.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :shutdown do
 
     summary 'Shutdown Windows Azure node instances'
@@ -34,7 +34,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'NONE'
     
     examples <<-'EOT'
-      $ puppet node_azure shutdown --publish-settings-file azuremanagement.publishsettings \
+      $ puppet azure_vm shutdown --publish-settings-file azuremanagement.publishsettings \
        --cloud-service-name service_name --vm-name name 
      
     EOT
diff --git a/lib/puppet/face/node_azure/start.rb b/lib/puppet/face/azure_vm/start.rb
similarity index 91%
rename from lib/puppet/face/node_azure/start.rb
rename to lib/puppet/face/azure_vm/start.rb
index 3d260f2..2d78d40 100644
--- a/lib/puppet/face/node_azure/start.rb
+++ b/lib/puppet/face/azure_vm/start.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :node_azure, '0.0.1' do
+Puppet::Face.define :azure_vm, '0.0.1' do
   action :start do
 
     summary 'starts Windows Azure node instances'
@@ -34,7 +34,7 @@ Puppet::Face.define :node_azure, '0.0.1' do
     returns 'NONE'
 
     examples <<-'EOT'
-      $ puppet node_azure start --publish-settings-file azuremanagement.publishsettings \
+      $ puppet azure_vm start --publish-settings-file azuremanagement.publishsettings \
        --cloud-service-name service_name --vm-name name
 
     EOT
diff --git a/lib/puppet/face/node_azure/views/images.erb b/lib/puppet/face/azure_vm/views/images.erb
similarity index 100%
rename from lib/puppet/face/node_azure/views/images.erb
rename to lib/puppet/face/azure_vm/views/images.erb
diff --git a/lib/puppet/face/node_azure/views/locations.erb b/lib/puppet/face/azure_vm/views/locations.erb
similarity index 100%
rename from lib/puppet/face/node_azure/views/locations.erb
rename to lib/puppet/face/azure_vm/views/locations.erb
diff --git a/lib/puppet/face/node_azure/views/servers.erb b/lib/puppet/face/azure_vm/views/servers.erb
similarity index 100%
rename from lib/puppet/face/node_azure/views/servers.erb
rename to lib/puppet/face/azure_vm/views/servers.erb
diff --git a/lib/puppet/face/virtual_network.rb b/lib/puppet/face/azure_vnet.rb
similarity index 95%
rename from lib/puppet/face/virtual_network.rb
rename to lib/puppet/face/azure_vnet.rb
index a55e4b2..996a454 100644
--- a/lib/puppet/face/virtual_network.rb
+++ b/lib/puppet/face/azure_vnet.rb
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 require 'puppet/virtual_network'
 
-Puppet::Face.define(:virtual_network, '0.0.1') do
+Puppet::Face.define(:azure_vnet, '0.0.1') do
   copyright "Windows Azure", 2013
   license   "Microsoft Open Technologies, Inc; see COPYING"
 
diff --git a/lib/puppet/face/virtual_network/list.rb b/lib/puppet/face/azure_vnet/list.rb
similarity index 94%
rename from lib/puppet/face/virtual_network/list.rb
rename to lib/puppet/face/azure_vnet/list.rb
index 0e7a58e..6c04e5d 100644
--- a/lib/puppet/face/virtual_network/list.rb
+++ b/lib/puppet/face/azure_vnet/list.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :virtual_network, '0.0.1' do
+Puppet::Face.define :azure_vnet, '0.0.1' do
   action :list do
 
     summary 'List virtual networks.'
@@ -36,7 +36,7 @@ Puppet::Face.define :virtual_network, '0.0.1' do
     returns 'Array of virtual network objets.'
 
     examples <<-'EOT'
-      $ puppet virtual_network list --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_vnet list --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=368a3-dcd0-4cd3 --management-endpoint=https://management.core.windows.net                                 Listing virtual networks
 
       Virtual Network: 1
diff --git a/lib/puppet/face/virtual_network/set_virtual_network.rb b/lib/puppet/face/azure_vnet/set_virtual_network.rb
similarity index 94%
rename from lib/puppet/face/virtual_network/set_virtual_network.rb
rename to lib/puppet/face/azure_vnet/set_virtual_network.rb
index 3b045b1..436a5f5 100644
--- a/lib/puppet/face/virtual_network/set_virtual_network.rb
+++ b/lib/puppet/face/azure_vnet/set_virtual_network.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :virtual_network, '0.0.1' do
+Puppet::Face.define :azure_vnet, '0.0.1' do
   action :set do
 
     summary 'Set Network configures the virtual network'
@@ -53,7 +53,7 @@ Puppet::Face.define :virtual_network, '0.0.1' do
     returns 'None '
 
     examples <<-'EOT'
-      $ puppet virtual_network set --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_vnet set --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=368a3-dcd0-4cd3 --management-endpoint=https://management.database.windows.net:8443/
 
     EOT
diff --git a/lib/puppet/face/virtual_network/set_xml_schema.rb b/lib/puppet/face/azure_vnet/set_xml_schema.rb
similarity index 91%
rename from lib/puppet/face/virtual_network/set_xml_schema.rb
rename to lib/puppet/face/azure_vnet/set_xml_schema.rb
index c1f040f..0dbda35 100644
--- a/lib/puppet/face/virtual_network/set_xml_schema.rb
+++ b/lib/puppet/face/azure_vnet/set_xml_schema.rb
@@ -13,7 +13,7 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 
-Puppet::Face.define :virtual_network, '0.0.1' do
+Puppet::Face.define :azure_vnet, '0.0.1' do
   action :set_xml_schema do
 
     summary 'set_xml_schema Network configures the virtual network using xml schema'
@@ -33,7 +33,7 @@ Puppet::Face.define :virtual_network, '0.0.1' do
     returns 'None '
 
     examples <<-'EOT'
-      $ puppet virtual_network set --management-certificate ~/exp/azuremanagement.pem\
+      $ puppet azure_vnet set --management-certificate ~/exp/azuremanagement.pem\
         --azure-subscription-id=368a3-dcd0-4cd3 --management-endpoint=https://management.database.windows.net:8443/
 
     EOT
diff --git a/lib/puppet/face/virtual_network/views/virtual_networks.erb b/lib/puppet/face/azure_vnet/views/virtual_networks.erb
similarity index 100%
rename from lib/puppet/face/virtual_network/views/virtual_networks.erb
rename to lib/puppet/face/azure_vnet/views/virtual_networks.erb
diff --git a/lib/puppet/sql_database.rb b/lib/puppet/sql_database.rb
index bb02723..0f4c821 100644
--- a/lib/puppet/sql_database.rb
+++ b/lib/puppet/sql_database.rb
@@ -29,7 +29,7 @@ module Puppet::SqlDatabase
     end
     
     def views(name)
-      File.join(File.dirname(__FILE__), 'face/database_server/views', name)
+      File.join(File.dirname(__FILE__), 'face/azure_sqldb/views', name)
     end
 
     def add_create_options(action)
diff --git a/lib/puppet/virtual_machine.rb b/lib/puppet/virtual_machine.rb
index 0cd90a1..6133923 100644
--- a/lib/puppet/virtual_machine.rb
+++ b/lib/puppet/virtual_machine.rb
@@ -20,7 +20,7 @@ module Puppet::VirtualMachine
   class << self
     
     def views(name)
-      File.join(File.dirname(__FILE__), 'face/node_azure/views', name)
+      File.join(File.dirname(__FILE__), 'face/azure_vm/views', name)
     end
 
     def add_shutdown_options(action)
diff --git a/lib/puppet/virtual_network.rb b/lib/puppet/virtual_network.rb
index 4db3e64..dfc1e85 100644
--- a/lib/puppet/virtual_network.rb
+++ b/lib/puppet/virtual_network.rb
@@ -22,7 +22,7 @@ module Puppet::VirtualNetwork
   class << self
     
     def views(name)
-      File.join(File.dirname(__FILE__), 'face/virtual_network/views', name)
+      File.join(File.dirname(__FILE__), 'face/azure_vnet/views', name)
     end
 
     def add_set_virtual_network_options(action)