diff --git a/lib/meta_web/controllers/virtual_machine_hosting_controller.ex b/lib/meta_web/controllers/virtual_machine_controller.ex
similarity index 97%
rename from lib/meta_web/controllers/virtual_machine_hosting_controller.ex
rename to lib/meta_web/controllers/virtual_machine_controller.ex
index 8560bc5..2065337 100644
--- a/lib/meta_web/controllers/virtual_machine_hosting_controller.ex
+++ b/lib/meta_web/controllers/virtual_machine_controller.ex
@@ -1,4 +1,4 @@
-defmodule MetaWeb.VirtualMachineHostingController do
+defmodule MetaWeb.VirtualMachineController do
   use MetaWeb, :controller
 
   alias Meta.OpenNebula, as: ONE
diff --git a/lib/meta_web/router.ex b/lib/meta_web/router.ex
index 4a48249..232adbd 100644
--- a/lib/meta_web/router.ex
+++ b/lib/meta_web/router.ex
@@ -75,8 +75,8 @@ defmodule MetaWeb.Router do
     get "/billing", BillingController, :index
     post "/billing/partner/update", BillingController, :update
 
-    get "/hosting/vm", VirtualMachineHostingController, :index
-    get "/hosting/vm/:location/:id", VirtualMachineHostingController, :show
+    get "/hosting/vm", VirtualMachineController, :index
+    get "/hosting/vm/:location/:id", VirtualMachineController, :show
   end
 
   scope "/", MetaWeb do
diff --git a/lib/meta_web/templates/layout/_sidebar_nav.html.eex b/lib/meta_web/templates/layout/_sidebar_nav.html.eex
index d6ed1f5..0672e58 100644
--- a/lib/meta_web/templates/layout/_sidebar_nav.html.eex
+++ b/lib/meta_web/templates/layout/_sidebar_nav.html.eex
@@ -12,7 +12,7 @@
     <li><%= link "Name Service", to: Routes.page_path(@conn, :index) %></li>
     <li><%= link "Storage Services", to: Routes.page_path(@conn, :index) %></li>
     -->
-    <li><%= link "Virtual Machines", to: Routes.virtual_machine_hosting_path(@conn, :index) %></li>
+    <li><%= link "Virtual Machines", to: Routes.virtual_machine_path(@conn, :index) %></li>
   <% else %>
     <li><%= link "Log in", to: Routes.user_session_path(@conn, :new) %></li>
     <li><%= link "Register", to: Routes.user_registration_path(@conn, :new) %></li>
diff --git a/lib/meta_web/templates/virtual_machine_hosting/index.html.eex b/lib/meta_web/templates/virtual_machine/index.html.eex
similarity index 95%
rename from lib/meta_web/templates/virtual_machine_hosting/index.html.eex
rename to lib/meta_web/templates/virtual_machine/index.html.eex
index c2c4dbf..03e3b5e 100644
--- a/lib/meta_web/templates/virtual_machine_hosting/index.html.eex
+++ b/lib/meta_web/templates/virtual_machine/index.html.eex
@@ -31,7 +31,7 @@ OpenNebula for every location you want to use.</p>
           <td><%= Map.get(vm, :NAME) %></td>
           <td><%= render_state(vm) %></td>
           <td>
-            <%= link "Show history »", to: Routes.virtual_machine_hosting_path(@conn, :show, location, Map.get(vm, :ID)) %>
+            <%= link "Show history »", to: Routes.virtual_machine_path(@conn, :show, location, Map.get(vm, :ID)) %>
           </td>
         </tr>
       <% end %>
diff --git a/lib/meta_web/templates/virtual_machine_hosting/show.html.eex b/lib/meta_web/templates/virtual_machine/show.html.eex
similarity index 100%
rename from lib/meta_web/templates/virtual_machine_hosting/show.html.eex
rename to lib/meta_web/templates/virtual_machine/show.html.eex
diff --git a/lib/meta_web/views/virtual_machine_hosting_view.ex b/lib/meta_web/views/virtual_machine_view.ex
similarity index 87%
rename from lib/meta_web/views/virtual_machine_hosting_view.ex
rename to lib/meta_web/views/virtual_machine_view.ex
index ce27262..fcd07a7 100644
--- a/lib/meta_web/views/virtual_machine_hosting_view.ex
+++ b/lib/meta_web/views/virtual_machine_view.ex
@@ -1,4 +1,4 @@
-defmodule MetaWeb.VirtualMachineHostingView do
+defmodule MetaWeb.VirtualMachineView do
   use MetaWeb, :view
 
   alias Meta.OpenNebula, as: ONE