diff --git a/database/db.changelog-3.2.xml b/database/db.changelog-3.2.xml
index 576713dc7..ebee6b9e1 100644
--- a/database/db.changelog-3.2.xml
+++ b/database/db.changelog-3.2.xml
@@ -5,6 +5,22 @@
   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
+  <changeSet author="author" id="changelog-3.2-normalize">
+
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <columnExists tableName="user" columnName="id"/>
+      </not>
+    </preConditions>
+
+    <renameTable oldTableName="quotedUser" newTableName="user" />
+
+    <modifySql>
+      <replace replace="quotedUser" with="&quot;user&quot;" />
+    </modifySql>
+
+  </changeSet>
+
   <changeSet author="author" id="changelog-3.2">
 
     <preConditions onFail="MARK_RAN">
diff --git a/database/db.changelog-3.3.xml b/database/db.changelog-3.3.xml
index cb9823ef8..54b1fa9eb 100644
--- a/database/db.changelog-3.3.xml
+++ b/database/db.changelog-3.3.xml
@@ -5,6 +5,24 @@
   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
+  <changeSet author="author" id="changelog-3.3-normalize">
+
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <columnExists tableName="user_device" columnName="read"/>
+      </not>
+    </preConditions>
+
+    <renameColumn tableName="user_device" oldColumnName="quotedRead" newColumnName="read" />
+    <renameColumn tableName="user_device" oldColumnName="quotedWrite" newColumnName="write" />
+
+    <modifySql>
+      <replace replace="quotedRead" with="&quot;read&quot;" />
+      <replace replace="quotedWrite" with="&quot;write&quot;" />
+    </modifySql>
+
+  </changeSet>
+
   <changeSet author="author" id="changelog-3.3">
 
     <dropDefaultValue tableName="user" columnName="salt" />