diff --git a/lib/sql/table_creator.rb b/lib/sql/table_creator.rb
index 03d7a9b..6c30362 100644
--- a/lib/sql/table_creator.rb
+++ b/lib/sql/table_creator.rb
@@ -64,7 +64,8 @@ def build_type(type_class)
         if type_class.is_a?(String)
           schema[:primitive] = type_class
         else
-          schema = @adapter.class.type_map[type_class].merge(schema)
+          primitive = type_class.respond_to?(:primitive) ? type_class.primitive : type_class
+          schema = @adapter.class.type_map[primitive].merge(schema)
         end
         @adapter.send(:with_connection) do |connection|
           @adapter.property_schema_statement(connection, schema)
diff --git a/lib/sql/table_modifier.rb b/lib/sql/table_modifier.rb
index c358d5e..1a65a6c 100644
--- a/lib/sql/table_modifier.rb
+++ b/lib/sql/table_modifier.rb
@@ -41,11 +41,11 @@ def change_column(name, type, opts = {})
     end
 
     def quote_column_name(name)
-      @adapter.send(:quote_column_name, name.to_s)
+      @adapter.send(:quote_name, name.to_s)
     end
 
     def quoted_table_name
-      @adapter.send(:quote_table_name, table_name)
+      @adapter.send(:quote_name, table_name)
     end
 
   end