diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb
index 218b992369..925b0b18c3 100644
--- a/src/acct/watch_helper.rb
+++ b/src/acct/watch_helper.rb
@@ -151,7 +151,7 @@ module WatchHelper
             String  :name
             String  :im_mad
             String  :vm_mad
-            String  :tm_mad
+            String  :vn_mad
         end
 
         DB.create_table? :vm_timestamps do
@@ -422,7 +422,7 @@ module WatchHelper
                 h.name   = host['NAME']
                 h.im_mad = host['IM_MAD']
                 h.vm_mad = host['VM_MAD']
-                h.tm_mad = host['TM_MAD']
+                h.vn_mad = host['VN_MAD']
             }
         end
 
diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb
index b50a02c617..306b1fcf75 100644
--- a/src/cli/one_helper/onehost_helper.rb
+++ b/src/cli/one_helper/onehost_helper.rb
@@ -122,7 +122,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         puts str % ["IM_MAD", host['IM_MAD']]
         puts str % ["VM_MAD", host['VM_MAD']]
         puts str % ["VN_MAD", host['VN_MAD']]
-        puts str % ["TM_MAD", host['TM_MAD']]
         puts str % ["LAST MONITORING TIME", host['LAST_MON_TIME']]
         puts
 
diff --git a/src/cli/onehost b/src/cli/onehost
index 40dbfe737e..115e2f7098 100755
--- a/src/cli/onehost
+++ b/src/cli/onehost
@@ -61,9 +61,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, :hostname, :im_mad, :vmm_mad,  
-            :tm_mad, :vnm_mad do
+            :vnm_mad do
         helper.create_resource(options) do |host|
-            host.allocate(args[0], args[1], args[2], args[4], args[3])
+            host.allocate(args[0], args[1], args[2], args[3])
         end
     end
 
diff --git a/src/oca/java/src/org/opennebula/client/host/Host.java b/src/oca/java/src/org/opennebula/client/host/Host.java
index d264d79130..13fbe45117 100644
--- a/src/oca/java/src/org/opennebula/client/host/Host.java
+++ b/src/oca/java/src/org/opennebula/client/host/Host.java
@@ -75,7 +75,6 @@ public class Host extends PoolElement{
      * @param vnm The name of the virtual network manager mad name
      * (vnm_mad_name), this values are taken from the oned.conf with the
      * tag name VN_MAD (name)
-     * @param tm The transfer manager mad name to be used with this host 
      * @return If successful the message contains the associated
      * id generated for this host
      */
@@ -83,10 +82,9 @@ public class Host extends PoolElement{
                                        String hostname,
                                        String im,
                                        String vmm,
-                                       String vnm,
-                                       String tm)
+                                       String vnm)
     {
-        return client.call(ALLOCATE, hostname, im, vmm, vnm, tm);
+        return client.call(ALLOCATE, hostname, im, vmm, vnm);
     }
 
     /**
diff --git a/src/oca/java/test/HostTest.java b/src/oca/java/test/HostTest.java
index 431b3ac11e..4126a259eb 100644
--- a/src/oca/java/test/HostTest.java
+++ b/src/oca/java/test/HostTest.java
@@ -63,8 +63,7 @@ public class HostTest
     @Before
     public void setUp() throws Exception
     {
-        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vnm_dummy",
-            "tm_dummy");
+        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vnm_dummy");
 
         int hid = !res.isError() ? Integer.parseInt(res.getMessage()) : -1;
         host    = new Host(hid, client);
@@ -84,8 +83,7 @@ public class HostTest
     {
         String name = "allocate_test";
 
-        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vmm_dummy",
-            "tm_dummy");
+        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vmm_dummy");
         assertTrue( !res.isError() );
 //        assertTrue( res.getMessage().equals("0") );
 
diff --git a/src/oca/ruby/OpenNebula/Host.rb b/src/oca/ruby/OpenNebula/Host.rb
index 74bb2e8edb..4a77bd2756 100644
--- a/src/oca/ruby/OpenNebula/Host.rb
+++ b/src/oca/ruby/OpenNebula/Host.rb
@@ -79,14 +79,14 @@ module OpenNebula
         # Allocates a new Host in OpenNebula
         #
         # @param hostname [String] Name of the new Host.
-        # @param im [String] Name of the im_driver
-        # @param vmm [String] Name of the vmm_driver
-        # @param tm [String] Name of the tm_driver
+        # @param im [String] Name of the im_driver (information/monitoring)
+        # @param vmm [String] Name of the vmm_driver (hypervisor)
+        # @param tm [String] Name of the vnm_driver (networking)
         #
         # @return [Integer, OpenNebula::Error] the new ID in case of
         #   success, error otherwise
-        def allocate(hostname,im,vmm,vnm,tm)
-            super(HOST_METHODS[:allocate],hostname,im,vmm,vnm,tm)
+        def allocate(hostname,im,vmm,vnm)
+            super(HOST_METHODS[:allocate],hostname,im,vmm,vnm)
         end
 
         # Deletes the Host