diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs
index 1741b2f6d..a395353a3 100644
--- a/src/PostgREST/App.hs
+++ b/src/PostgREST/App.hs
@@ -160,10 +160,10 @@ app dbStructure conf reqBody req =
       return $ responseLBS status404 [] ""
 
   where
-    allTabs = tables dbStructure
-    allRels = relations dbStructure
-    allCols = columns dbStructure
-    allPrKeys = primaryKeys dbStructure
+    allTabs = dbTables dbStructure
+    allRels = dbRelations dbStructure
+    allCols = dbColumns dbStructure
+    allPrKeys = dbPrimaryKeys dbStructure
     filterCol sc table (Column{colTable=Table{tableSchema=s, tableName=t}}) = s==sc && table==t
     filterCol _ _ _ =  False
     filterPk sc table pk = sc == (tableSchema . pkTable) pk && table == (tableName . pkTable) pk
diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
index a83ae50b9..17a94ff07 100644
--- a/src/PostgREST/Config.hs
+++ b/src/PostgREST/Config.hs
@@ -28,7 +28,7 @@ import           Data.Text                   (strip)
 import           Data.Version                (versionBranch)
 import           Network.Wai
 import           Network.Wai.Middleware.Cors (CorsResourcePolicy (..))
-import           Options.Applicative         hiding (columns)
+import           Options.Applicative
 import           Paths_postgrest             (version)
 import           Prelude
 
diff --git a/src/PostgREST/DbStructure.hs b/src/PostgREST/DbStructure.hs
index 67519a390..81dbb2deb 100644
--- a/src/PostgREST/DbStructure.hs
+++ b/src/PostgREST/DbStructure.hs
@@ -39,10 +39,10 @@ getDbStructure schema = do
       keys' = synonymousPrimaryKeys syns keys
 
   return DbStructure {
-      tables = tabs
-    , columns = cols'
-    , relations = rels'
-    , primaryKeys = keys'
+      dbTables = tabs
+    , dbColumns = cols'
+    , dbRelations = rels'
+    , dbPrimaryKeys = keys'
     }
 
 doesProc :: forall c s. B.CxValue c Int =>
diff --git a/src/PostgREST/MainTest.hs b/src/PostgREST/MainTest.hs
index 45326d33d..f9b90e9cc 100644
--- a/src/PostgREST/MainTest.hs
+++ b/src/PostgREST/MainTest.hs
@@ -98,10 +98,10 @@ main = do
     (\(tabs, rels, cols, keys) ->
 
       return DbStructure {
-          tables=tabs
-        , columns=cols
-        , relations=rels
-        , primaryKeys=keys
+          dbTables=tabs
+        , dbColumns=cols
+        , dbRelations=rels
+        , dbPrimaryKeys=keys
         }
     ) metadata
   runSettings appSettings $ middle $ \ req respond -> do
diff --git a/src/PostgREST/Types.hs b/src/PostgREST/Types.hs
index ae9e8e819..19a8d05b0 100644
--- a/src/PostgREST/Types.hs
+++ b/src/PostgREST/Types.hs
@@ -6,10 +6,10 @@ import Data.Aeson
 import Data.Map
 
 data DbStructure = DbStructure {
-  tables :: [Table]
-, columns :: [Column]
-, relations :: [Relation]
-, primaryKeys :: [PrimaryKey]
+  dbTables :: [Table]
+, dbColumns :: [Column]
+, dbRelations :: [Relation]
+, dbPrimaryKeys :: [PrimaryKey]
 } deriving (Show, Eq)
 
 type Schema = Text