diff --git a/tm_admin/generator.py b/tm_admin/generator.py
index 4a71e4a1..59e27d1a 100755
--- a/tm_admin/generator.py
+++ b/tm_admin/generator.py
@@ -56,7 +56,7 @@ def __init__(self,
             self.yaml = YamlFile(filespec)
         self.createTypes()
         self.yaml2py = {'int32': 'int',
-                    'int64': 'bigint',
+                    'int64': 'int',
                     'bool': 'bool',
                     'string': 'str',
                     'bytes': 'bytes',
@@ -66,7 +66,7 @@ def __init__(self,
                     }
 
         self.yaml2sql = {'int32': 'int',
-                    'int64': 'int',
+                    'int64': 'bigint',
                     'bool': 'bool',
                     'string': 'character varying',
                     'bytes': 'bytea',