diff --git a/lib/teslamate/settings/units/length.ex b/lib/teslamate/settings/units/length.ex
index 3770e6f880..bcf492c587 100644
--- a/lib/teslamate/settings/units/length.ex
+++ b/lib/teslamate/settings/units/length.ex
@@ -1,3 +1,3 @@
 defmodule TeslaMate.Settings.Units.Length do
-  use EctoEnum.Postgres, type: :length, enums: [:km, :mi]
+  use EctoEnum.Postgres, type: :unit_of_length, enums: [:km, :mi]
 end
diff --git a/lib/teslamate/settings/units/temperature.ex b/lib/teslamate/settings/units/temperature.ex
index 2e8e596da9..1c65a331ac 100644
--- a/lib/teslamate/settings/units/temperature.ex
+++ b/lib/teslamate/settings/units/temperature.ex
@@ -1,3 +1,3 @@
 defmodule TeslaMate.Settings.Units.Temperature do
-  use EctoEnum.Postgres, type: :temperature, enums: [:C, :F]
+  use EctoEnum.Postgres, type: :unit_of_temperature, enums: [:C, :F]
 end
diff --git a/priv/repo/migrations/20190810105216_unit_of_legnth_and_temperature.exs b/priv/repo/migrations/20190810105216_unit_of_legnth_and_temperature.exs
index 7d8215d612..e7beb9c0f1 100644
--- a/priv/repo/migrations/20190810105216_unit_of_legnth_and_temperature.exs
+++ b/priv/repo/migrations/20190810105216_unit_of_legnth_and_temperature.exs
@@ -1,11 +1,18 @@
 defmodule TeslaMate.Repo.Migrations.UnitOfLegnthAndTemperature do
   use Ecto.Migration
 
-  alias TeslaMate.Settings.Units
   alias TeslaMate.Repo
 
   import Ecto.Query
 
+  defmodule Units.Length do
+    use EctoEnum.Postgres, type: :length, enums: [:km, :mi]
+  end
+
+  defmodule Units.Temperature do
+    use EctoEnum.Postgres, type: :temperature, enums: [:C, :F]
+  end
+
   def up do
     [use_imperial_units?] =
       from(s in "settings", select: s.use_imperial_units)
diff --git a/priv/repo/migrations/20200528173223_rename_unit_enums.exs b/priv/repo/migrations/20200528173223_rename_unit_enums.exs
new file mode 100644
index 0000000000..d011898876
--- /dev/null
+++ b/priv/repo/migrations/20200528173223_rename_unit_enums.exs
@@ -0,0 +1,15 @@
+defmodule TeslaMate.Repo.Migrations.RenameUnitEnums do
+  use Ecto.Migration
+
+  def change do
+    execute(
+      "ALTER TYPE length RENAME TO unit_of_length",
+      "ALTER TYPE unit_of_length RENAME TO length"
+    )
+
+    execute(
+      "ALTER TYPE temperature RENAME TO unit_of_temperature",
+      "ALTER TYPE unit_of_temperature RENAME TO temperature"
+    )
+  end
+end