diff --git a/codeGenNodes.py b/codeGenNodes.py
index 1a32a8777c239652e86a2aef04944a19890a853f..695b6d858166138350bd1dfe4d68e6dd91a0081a 100644
--- a/codeGenNodes.py
+++ b/codeGenNodes.py
@@ -17,7 +17,7 @@ class genNameNode():
             self.code = p("mov", "eax", "[ebp - " + str(self.nodeLink.offset) + "]")
         elif self.nodeLink.__class__.__name__ == "ParamNode":
             self.code = p("mov", "eax", "[ebp + " + str(self.nodeLink.offset) + "]")
-        elif self.nodeLink.__class__.__name__ == "fieldDcl":
+        elif self.nodeLink.__class__.__name__ == "FieldNode":
             if self.isStatic:
                 label = nodeLink.typeName + "_" + nodeLink.name
                 self.code += importHelper(fieldNode.typeName, self.typeName, "S_"+label) + \
@@ -26,7 +26,7 @@ class genNameNode():
             else:
                 # object will already be in eax
                 # Null check
-                result += p("call", "H__Null_Check")
+                self.code += p("call", "H__Null_Check")
                 self.code += p("add", "eax", self.nodeLink.offset)
                 self.code +=  p("mov", "eax", "[eax]")
         return self.code
@@ -42,7 +42,7 @@ class genNameNode():
         elif self.nodeLink.__class__.__name__ == "ParamNode":
             result = p("mov", "eax", "ebp")
             result += p("add", "eax", str(self.nodeLink.offset))
-        elif self.nodeLink.__class__.__name__ == "fieldDcl":
+        elif self.nodeLink.__class__.__name__ == "FieldNode":
             if self.isStatic:
                 label = nodeLink.typeName + "_" + nodeLink.name
                 self.code += importHelper(fieldNode.typeName, self.typeName, "S_"+label) + \