diff --git a/src/solar-logger/database.cpp b/src/solar-logger/database.cpp
index 115d9de..1a1bef5 100644
--- a/src/solar-logger/database.cpp
+++ b/src/solar-logger/database.cpp
@@ -11,9 +11,9 @@
 std::string ToSqlInsertStatement(ZeverRow const & row)
 {
     std::stringstream ss;
-    ss << "INSERT INTO ZeverLogs VALUES(" << '\'' << Util::GetSqliteDate(row.epochTime) << "'," << '\''
-       << Util::GetSqliteUtcTime(row.epochTime) << "'," << row.watt << ','
-       << static_cast<std::int64_t>(round(row.kilowattPerHour * 1000)) << ");";
+    ss << "INSERT INTO ZeverLogs(Date,TimeUtc,CurrentWatts,TotalWatts) VALUES(" << '\''
+       << Util::GetSqliteDate(row.epochTime) << "'," << '\'' << Util::GetSqliteUtcTime(row.epochTime) << "',"
+       << row.watt << ',' << static_cast<std::int64_t>(round(row.kilowattPerHour * 1000)) << ");";
 
     return ss.str();
 }
@@ -21,9 +21,9 @@ std::string ToSqlInsertStatement(ZeverRow const & row)
 std::string ToSqlInsertStatement(EnvoyRow const & row)
 {
     std::stringstream ss;
-    ss << "INSERT INTO EnvoyLogs VALUES(" << '\'' << Util::GetSqliteDate(row.epochTime) << "'," << '\''
-       << Util::GetSqliteUtcTime(row.epochTime) << "'," << row.currentWatt << ',' << row.lifetimeWattHour << ','
-       << row.inverterCount << ");";
+    ss << "INSERT INTO EnvoyLogs(Date,TimeUtc,CurrentWatts,TotalWatts,Inverters) VALUES(" << '\''
+       << Util::GetSqliteDate(row.epochTime) << "'," << '\'' << Util::GetSqliteUtcTime(row.epochTime) << "',"
+       << row.currentWatt << ',' << row.lifetimeWattHour << ',' << row.inverterCount << ");";
 
     return ss.str();
 }