diff --git a/database/postgis/fields.go b/database/postgis/columns.go
similarity index 100%
rename from database/postgis/fields.go
rename to database/postgis/columns.go
diff --git a/mapping/fields.go b/mapping/columns.go
similarity index 100%
rename from mapping/fields.go
rename to mapping/columns.go
diff --git a/mapping/fields_test.go b/mapping/columns_test.go
similarity index 100%
rename from mapping/fields_test.go
rename to mapping/columns_test.go