diff --git a/script/sql/create/13.controls.sql b/script/sql/create/13.controls.sql
index aa107eb..71e74da 100644
--- a/script/sql/create/13.controls.sql
+++ b/script/sql/create/13.controls.sql
@@ -25,6 +25,6 @@ CREATE TABLE CONTROLS_3
 (
   LinkID VARCHAR(32) PRIMARY KEY REFERENCES _LINK(ID)
 , Status TEXT NOT NULL -- OPEN / CLOSED, a pump speed setting, or a control valve setting
-, ClockTimeHour INTERVAL HOUR -- get AM/PM from it
-, ClockTimeMin  INTERVAL MINUTE
+, Clock_Time_Hour INTERVAL HOUR -- get AM/PM from it
+, Clock_Time_Min  INTERVAL MINUTE
 );
diff --git a/script/sql/create/18.sources.sql b/script/sql/create/18.sources.sql
index 1c2ec64..08009f2 100644
--- a/script/sql/create/18.sources.sql
+++ b/script/sql/create/18.sources.sql
@@ -7,5 +7,5 @@ CREATE TABLE SOURCES
   Node VARCHAR(32) PRIMARY KEY REFERENCES _NODE(ID)
 , Type SOURCES_TYPE NOT NULL
 , Strength NUMERIC NOT NULL
-, TimePattern VARCHAR(32) REFERENCES _PATTERN(ID)
+, Time_Pattern VARCHAR(32) REFERENCES _PATTERN(ID)
 );
diff --git a/script/sql/create/4.tanks.sql b/script/sql/create/4.tanks.sql
index df0bdf4..fd5aee4 100644
--- a/script/sql/create/4.tanks.sql
+++ b/script/sql/create/4.tanks.sql
@@ -6,11 +6,11 @@ CREATE TABLE TANKS
 (
   ID VARCHAR(32) PRIMARY KEY REFERENCES _NODE(ID)
 , Elevation NUMERIC NOT NULL
-, InitLevel NUMERIC NOT NULL
-, MinLevel NUMERIC NOT NULL
-, MaxLevel NUMERIC NOT NULL
+, Init_Level NUMERIC NOT NULL
+, Min_Level NUMERIC NOT NULL
+, Max_Level NUMERIC NOT NULL
 , Diameter NUMERIC NOT NULL
-, MinVol NUMERIC NOT NULL
-, VolCurve VARCHAR(32) REFERENCES _CURVE(ID)
+, Min_Vol NUMERIC NOT NULL
+, Vol_Curve VARCHAR(32) REFERENCES _CURVE(ID)
 , Overflow TANKS_OVERFLOW
 );
diff --git a/script/sql/create/5.pipes.sql b/script/sql/create/5.pipes.sql
index fb1dc2d..cb04ea6 100644
--- a/script/sql/create/5.pipes.sql
+++ b/script/sql/create/5.pipes.sql
@@ -10,6 +10,6 @@ CREATE TABLE PIPES
 , Length NUMERIC NOT NULL
 , Diameter NUMERIC NOT NULL
 , Roughness NUMERIC NOT NULL
-, MinorLoss NUMERIC NOT NULL
+, Minor_Loss NUMERIC NOT NULL
 , Status PIPES_STATUS NOT NULL
 );
diff --git a/script/sql/create/7.valves.sql b/script/sql/create/7.valves.sql
index 7159aac..9de645e 100644
--- a/script/sql/create/7.valves.sql
+++ b/script/sql/create/7.valves.sql
@@ -10,5 +10,5 @@ CREATE TABLE VALVES
 , Diameter NUMERIC NOT NULL
 , Type VALVES_TYPE NOT NULL
 , Setting NUMERIC NOT NULL
-, MinorLoss NUMERIC NOT NULL
+, Minor_Loss NUMERIC NOT NULL
 );