diff --git a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
index c0a228968..775b34877 100644
--- a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
+++ b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
@@ -21,10 +21,10 @@ type PostgresDriver* = ref object of ArchiveDriver
   connPool: PgAsyncPool
 
 proc dropTableQuery(): string =
-  "DROP TABLE message"
+  "DROP TABLE messages"
 
 proc createTableQuery(): string =
-  "CREATE TABLE IF NOT EXISTS message (" &
+  "CREATE TABLE IF NOT EXISTS messages (" &
   " pubsubTopic VARCHAR NOT NULL," &
   " contentTopic VARCHAR NOT NULL," &
   " payload VARCHAR," &
@@ -37,7 +37,7 @@ proc createTableQuery(): string =
 
 proc insertRow(): string =
   # TODO: get the sql queries from a file
- """INSERT INTO message (id, storedAt, contentTopic, payload, pubsubTopic,
+ """INSERT INTO messages (id, storedAt, contentTopic, payload, pubsubTopic,
   version, timestamp) VALUES ($1, $2, $3, $4, $5, $6, $7);"""
 
 const MaxNumConns = 5 #TODO: we may need to set that from app args (maybe?)
@@ -142,11 +142,11 @@ proc toArchiveRow(r: Row): ArchiveDriverResult[ArchiveRow] =
 
 method getAllMessages*(s: PostgresDriver):
                        Future[ArchiveDriverResult[seq[ArchiveRow]]] {.async.} =
-  ## Retrieve all message from the store.
+  ## Retrieve all messages from the store.
 
   let rowsRes = await s.connPool.query("""SELECT storedAt, contentTopic,
                                        payload, pubsubTopic, version, timestamp,
-                                       id FROM message ORDER BY storedAt ASC""",
+                                       id FROM messages ORDER BY storedAt ASC""",
                                        newSeq[string](0))
 
   if rowsRes.isErr():
@@ -172,7 +172,7 @@ method getMessages*(s: PostgresDriver,
                     ascendingOrder = true):
                     Future[ArchiveDriverResult[seq[ArchiveRow]]] {.async.} =
   var query = """SELECT storedAt, contentTopic, payload,
-  pubsubTopic, version, timestamp, id FROM message"""
+  pubsubTopic, version, timestamp, id FROM messages"""
   var statements: seq[string]
   var args: seq[string]
 
@@ -257,7 +257,7 @@ proc getInt(s: PostgresDriver,
 method getMessagesCount*(s: PostgresDriver):
                          Future[ArchiveDriverResult[int64]] {.async.} =
 
-  let intRes = await s.getInt("SELECT COUNT(1) FROM message")
+  let intRes = await s.getInt("SELECT COUNT(1) FROM messages")
   if intRes.isErr():
     return err("error in getMessagesCount: " & intRes.error)
 
@@ -266,7 +266,7 @@ method getMessagesCount*(s: PostgresDriver):
 method getOldestMessageTimestamp*(s: PostgresDriver):
                                   Future[ArchiveDriverResult[Timestamp]] {.async.} =
 
-  let intRes = await s.getInt("SELECT MIN(storedAt) FROM message")
+  let intRes = await s.getInt("SELECT MIN(storedAt) FROM messages")
   if intRes.isErr():
     return err("error in getOldestMessageTimestamp: " & intRes.error)
 
@@ -275,7 +275,7 @@ method getOldestMessageTimestamp*(s: PostgresDriver):
 method getNewestMessageTimestamp*(s: PostgresDriver):
                                   Future[ArchiveDriverResult[Timestamp]] {.async.} =
 
-  let intRes = await s.getInt("SELECT MAX(storedAt) FROM message")
+  let intRes = await s.getInt("SELECT MAX(storedAt) FROM messages")
   if intRes.isErr():
     return err("error in getNewestMessageTimestamp: " & intRes.error)
 
@@ -287,7 +287,7 @@ method deleteMessagesOlderThanTimestamp*(
                                  Future[ArchiveDriverResult[void]] {.async.} =
 
   let execRes = await s.connPool.exec(
-                            "DELETE FROM message WHERE storedAt < " & $ts)
+                            "DELETE FROM messages WHERE storedAt < " & $ts)
   if execRes.isErr():
     return err("error in deleteMessagesOlderThanTimestamp: " & execRes.error)
 
@@ -299,9 +299,9 @@ method deleteOldestMessagesNotWithinLimit*(
                                  Future[ArchiveDriverResult[void]] {.async.} =
 
   let execRes = await s.connPool.exec(
-                     """DELETE FROM message WHERE id NOT IN
+                     """DELETE FROM messages WHERE id NOT IN
                           (
-                        SELECT id FROM message ORDER BY storedAt DESC LIMIT ?
+                        SELECT id FROM messages ORDER BY storedAt DESC LIMIT ?
                           );""",
                      @[$limit])
   if execRes.isErr():