expect_yes = self.apiserver.GetNodeTags(auth,
                                                                 {'hostname':nodename,
                                                                  'tagname':nodegroupname},
-                                                                ['tagvalue'])[0]['tagvalue']
+                                                                ['value'])[0]['value']
                         if expect_yes != "yes":
                             print 'Mismatch node tag on node',nodename,'got',expect_yes
                             overall=False
 
             
             # Add node group
             groupname = random_nodegroup() ['groupname']
-            tagvalue = 'yes'
-            nodegroup_id = self.api.AddNodeGroup(groupname, tagname, tagvalue)
+            value = 'yes'
+            nodegroup_id = self.api.AddNodeGroup(groupname, tagname, value)
 
             # Should return a unique nodegroup_id
             assert nodegroup_id not in self.nodegroup_ids
                 nodegroup = self.api.GetNodeGroups([nodegroup_id])[0]
                 assert nodegroup['groupname'] == groupname
                 assert nodegroup['tagname'] == tagname
-                assert nodegroup['tagvalue'] == tagvalue
+                assert nodegroup['value'] == value
 
             if self.verbose:
                 print "Added node group", nodegroup_id
     def AddTagTypes(self,n_sa,n_ng,n_il):
         """
         Add as many tag types as there are nodegroups, 
-        will use tagvalue=yes for each nodegroup
+        will use value=yes for each nodegroup
         """
 
         roles = self.api.GetRoles()