diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 77cbe986..dd20026c 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -3,6 +3,9 @@
     - double check verification
     - adjust tests
 
+- remove useless
+    ERROR: monitoring02: Code that raised the error:
+
 --------------------------------------------------------------------------------
 
 - __user
diff --git a/lib/cdist/core/code.py b/lib/cdist/core/code.py
index 51912559..7e69f21c 100644
--- a/lib/cdist/core/code.py
+++ b/lib/cdist/core/code.py
@@ -96,13 +96,13 @@ class Code(object):
             self.env.update({'__debug': "yes" })
 
     def _run_gencode(self, cdist_object, which):
-        cdist_type = cdist_object.type
+        cdist_type = cdist_object.cdist_type
         script = os.path.join(self.local.type_path, getattr(cdist_type, 'gencode_%s_path' % which))
         if os.path.isfile(script):
             env = os.environ.copy()
             env.update(self.env)
             env.update({
-                '__type': cdist_object.type.absolute_path,
+                '__type': cdist_object.cdist_type.absolute_path,
                 '__object': cdist_object.absolute_path,
                 '__object_id': cdist_object.object_id,
                 '__object_name': cdist_object.name,
diff --git a/lib/cdist/test/object/__init__.py b/lib/cdist/test/object/__init__.py
index 72530910..3a91f709 100644
--- a/lib/cdist/test/object/__init__.py
+++ b/lib/cdist/test/object/__init__.py
@@ -198,5 +198,5 @@ class ObjectTestCase(test.CdistTestCase):
         other_name = '__first/man'
         other_object = self.cdist_object.object_from_name(other_name)
         self.assertTrue(isinstance(other_object, core.CdistObject))
-        self.assertEqual(other_object.type.name, '__first')
+        self.assertEqual(other_object.cdist_type.name, '__first')
         self.assertEqual(other_object.object_id, 'man')