diff --git a/pyogp/lib/base/message_template.py b/pyogp/lib/base/message_template.py
index 027e609..d7a3dc9 100644
--- a/pyogp/lib/base/message_template.py
+++ b/pyogp/lib/base/message_template.py
@@ -49,7 +49,7 @@ HIGH_FREQUENCY_MESSAGE   = ''
         self.name = name
         self.lltype = tp"""
 
-class PacketBlock():
+class MessageTemplateBlock():
     def __init__(self, header):
         self.header = header
         self.name = header[0]
@@ -75,7 +75,7 @@ class PacketBlock():
 
         return None
 
-class Packet():
+class MessageTemplate():
     def __init__(self, header):
         self.header = header
         self.name = header[0]
diff --git a/pyogp/lib/base/message_template_parser.py b/pyogp/lib/base/message_template_parser.py
index e78bda7..abe7327 100644
--- a/pyogp/lib/base/message_template_parser.py
+++ b/pyogp/lib/base/message_template_parser.py
@@ -1,5 +1,5 @@
 import re
-import packet
+import message_template
 import pprint
 from pyogp.lib.base.data import msg_tmpl
 
@@ -32,7 +32,7 @@ def template_message_parser():
             parts = packet_header.group(1)
             parts = parts.split()
             
-            current_packet = packet.Packet(parts)
+            current_packet = message_template.MessageTemplate(parts)
             dic[current_packet.name] = current_packet
 
         block_header = re.match("^\t\t([^{}]+.+)",line) #gets packet block header
@@ -40,11 +40,11 @@ def template_message_parser():
             parts = block_header.group(1)
             parts = parts.split()
             
-            current_block = packet.PacketBlock(parts)
+            current_block = message_template.MessageTemplateBlock(parts)
             current_packet.addBlock(current_block)
             
         block_data  = re.match("^\t\t([{}]+.+)",line)  #gets block data
-        if block_template_message_parserdata != None:
+        if block_data != None:
             parts = block_data.group(1)
             parts = parts.split()
             parts.remove('{')