diff --git a/relational-schemas.cabal b/relational-schemas.cabal
--- a/relational-schemas.cabal
+++ b/relational-schemas.cabal
@@ -1,5 +1,5 @@
 name:                relational-schemas
-version:             0.1.2.1
+version:             0.1.2.2
 synopsis:            RDBMSs' schema templates for relational-query
 description:         This package contains some RDBMSs' schema structure definitions.
                      Supported RDBMS schemas are below:
@@ -74,7 +74,7 @@
                        , bytestring
 
                        , persistable-record >= 0.2
-                       , relational-query >= 0.7
+                       , relational-query >= 0.8
 
   hs-source-dirs:      src
   ghc-options:         -Wall
diff --git a/src/Database/Relational/Schema/DB2Syscat/Columns.hs b/src/Database/Relational/Schema/DB2Syscat/Columns.hs
--- a/src/Database/Relational/Schema/DB2Syscat/Columns.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Columns.hs
@@ -15,12 +15,12 @@
 
 import Data.Int (Int16, Int32, Int64)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.DB2Syscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "SYSCAT" "columns"
   [
     -- column                         schema    type               length         NULL
diff --git a/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs b/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
--- a/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
@@ -16,13 +16,13 @@
 module Database.Relational.Schema.DB2Syscat.Keycoluse where
 
 import Data.Int (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.DB2Syscat.Config (config)
 
 
 -- Not all column is mapped. Minimum implementation.
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "SYSCAT" "keycoluse"
   [("constname", [t| String |]),
    ("colname"  , [t| String |]),
diff --git a/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs b/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
--- a/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
@@ -15,13 +15,13 @@
 -- Minimum implementation required to generate table constraints.
 module Database.Relational.Schema.DB2Syscat.Tabconst where
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.DB2Syscat.Config (config)
 
 
 -- Not all column is mapped. Minimum implementation.
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "SYSCAT" "tabconst"
   [("constname", [t| String |]),
    ("tabschema", [t| String |]),
diff --git a/src/Database/Relational/Schema/MySQLInfo/Columns.hs b/src/Database/Relational/Schema/MySQLInfo/Columns.hs
--- a/src/Database/Relational/Schema/MySQLInfo/Columns.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/Columns.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.MySQLInfo.Columns where
 
 import Data.Int                     (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.MySQLInfo.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "INFORMATION_SCHEMA" "columns"
     [ ("table_schema",      [t|String|])
     , ("table_name",        [t|String|])
diff --git a/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs b/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
--- a/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.MySQLInfo.KeyColumnUsage where
 
 import Data.Int                     (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.MySQLInfo.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "INFORMATION_SCHEMA" "key_column_usage"
     [ ("constraint_name"    , [t| String |])
     , ("table_schema"       , [t| String |])
diff --git a/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs b/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
--- a/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
@@ -3,12 +3,12 @@
 
 module Database.Relational.Schema.MySQLInfo.TableConstraints where
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.MySQLInfo.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "INFORMATION_SCHEMA" "table_constraints"
     [ ("table_schema"       , [t| String |])
     , ("table_name"         , [t| String |])
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs b/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
--- a/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
@@ -5,12 +5,12 @@
 
 import Data.Int (Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.OracleDataDictionary.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "SYS" "dba_cons_columns"
     -- Column                                    NULL?    Datatype
     -- ----------------------------------------- -------- ----------------------------
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs b/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
--- a/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
@@ -3,12 +3,12 @@
 
 module Database.Relational.Schema.OracleDataDictionary.Constraints where
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.OracleDataDictionary.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "SYS" "dba_constraints"
     -- Column                                    NULL?    Datatype
     -- ----------------------------------------- -------- ----------------------------
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs b/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
--- a/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
@@ -7,12 +7,12 @@
 -- import Data.ByteString (ByteString)
 -- import Data.Time.Calendar (Day)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.OracleDataDictionary.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
     "SYS" "dba_tab_columns"
     -- Column                                    NULL?    Datatype
     -- ----------------------------------------- -------- ----------------------------
diff --git a/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs b/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
--- a/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
@@ -13,12 +13,12 @@
 
 import Data.Int (Int16, Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.PgCatalog.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "PG_CATALOG" "pg_attribute"
 
   [
diff --git a/src/Database/Relational/Schema/PgCatalog/PgClass.hs b/src/Database/Relational/Schema/PgCatalog/PgClass.hs
--- a/src/Database/Relational/Schema/PgCatalog/PgClass.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgClass.hs
@@ -13,12 +13,12 @@
 
 import Data.Int (Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.PgCatalog.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "PG_CATALOG" "pg_class"
   [("oid"         , [t| Int32 |]),
  -- relname        | name      | not null
diff --git a/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs b/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
--- a/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
@@ -13,12 +13,12 @@
 
 import Data.Int (Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.PgCatalog.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "PG_CATALOG" "pg_constraint"
   [ -- ("oid"    , [t| Int32 |]),
  -- conname       | name         | not null
diff --git a/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs b/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
--- a/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
@@ -13,12 +13,12 @@
 
 import Data.Int (Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.PgCatalog.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "PG_CATALOG" "pg_namespace"
   [("oid"    , [t| Int32 |]),
  -- nspname  | name      | not null
diff --git a/src/Database/Relational/Schema/PgCatalog/PgType.hs b/src/Database/Relational/Schema/PgCatalog/PgType.hs
--- a/src/Database/Relational/Schema/PgCatalog/PgType.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgType.hs
@@ -13,12 +13,12 @@
 
 import Data.Int (Int16, Int32)
 
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.PgCatalog.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "PG_CATALOG" "pg_type"
 
   [
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs b/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
--- a/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLServerSyscat.Columns where
 
 import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLServerSyscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "sys" "columns"
   [
   -- column                schema  type                length   NULL
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs b/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
--- a/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLServerSyscat.IndexColumns where
 
 import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLServerSyscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "sys" "index_columns"
   [
   -- column                schema  type                length   NULL
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs b/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
--- a/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
@@ -5,12 +5,12 @@
 
 --import Data.ByteString (ByteString)
 import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLServerSyscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "sys" "indexes"
   [
 -- View "sys.indexes"
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Types.hs b/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
--- a/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLServerSyscat.Types where
 
 import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLServerSyscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "sys" "types"
   [
 -- View "sys.types"
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs b/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLite3Syscat.IndexInfo where
 
 import Data.Int (Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLite3Syscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "pragma" "index_info"
   [
 -- pragma "index_info"
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs b/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLite3Syscat.IndexList where
 
 import Data.Int (Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLite3Syscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "pragma" "index_list"
   [
 -- pragma "main.index_list"
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs b/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
--- a/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
@@ -4,12 +4,12 @@
 module Database.Relational.Schema.SQLite3Syscat.TableInfo where
 
 import Data.Int (Int16, Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecord)
 
 import Database.Relational.Schema.SQLite3Syscat.Config (config)
 
 
-$(defineTableTypesAndRecordDefault config
+$(defineTableTypesAndRecord config
   "pragma" "table_info"
   [
 -- View "main.sqlite_master"