diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index 12c884b12..eae9df2d6 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -45,7 +45,7 @@
 
 
 /*
- * DatabaseCollationInfo is used to store collation related information of a database
+ * DatabaseCollationInfo is used to store collation related information of a database.
  */
 typedef struct DatabaseCollationInfo
 {
@@ -205,7 +205,7 @@ PreprocessGrantOnDatabaseStmt(Node *node, const char *queryString,
  *   true if the statement is a SET TABLESPACE statement, false otherwise.
  */
 static bool
-isSetTablespaceStatement(AlterDatabaseStmt *stmt)
+IsSetTablespaceStatement(AlterDatabaseStmt *stmt)
 {
 	DefElem *def = NULL;
 	foreach_ptr(def, stmt->options)
@@ -245,7 +245,7 @@ PreprocessAlterDatabaseStmt(Node *node, const char *queryString,
 								sql,
 								ENABLE_DDL_PROPAGATION);
 
-	if (isSetTablespaceStatement(stmt))
+	if (IsSetTablespaceStatement(stmt))
 	{
 		/*
 		 * Set tablespace does not work inside a transaction.Therefore, we need to use
diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index b0fe4f820..9c455d0bb 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -38,7 +38,7 @@ static void AppendBasicAlterDatabaseOptions(StringInfo buf, DefElem *def, bool *
 static void AppendGrantDatabases(StringInfo buf, GrantStmt *stmt);
 static void AppendAlterDatabaseSetTablespace(StringInfo buf, DefElem *def, char *dbname);
 
-const DefElemOptionFormat create_database_option_formats[] = {
+const DefElemOptionFormat createDatabaseOptionFormats[] = {
 	{ "owner", " OWNER %s", OPTION_FORMAT_STRING },
 	{ "template", " TEMPLATE %s", OPTION_FORMAT_STRING },
 	{ "encoding", " ENCODING %s", OPTION_FORMAT_LITERAL_CSTR },
@@ -53,8 +53,7 @@ const DefElemOptionFormat create_database_option_formats[] = {
 	{ "tablespace", " TABLESPACE %s", OPTION_FORMAT_STRING },
 	{ "allow_connections", " ALLOW_CONNECTIONS %s", OPTION_FORMAT_BOOLEAN },
 	{ "connection_limit", " CONNECTION LIMIT %d", OPTION_FORMAT_INTEGER },
-	{ "is_template", " IS_TEMPLATE %s", OPTION_FORMAT_BOOLEAN },
-	{ "oid", " OID %d", OPTION_FORMAT_OBJECT_ID }
+	{ "is_template", " IS_TEMPLATE %s", OPTION_FORMAT_BOOLEAN }
 };
 
 
@@ -333,8 +332,8 @@ AppendCreateDatabaseStmt(StringInfo buf, CreatedbStmt *stmt)
 	DefElem *option = NULL;
 	foreach_ptr(option, stmt->options)
 	{
-		DefElemOptionToStatement(buf, option, create_database_option_formats,
-								 lengthof(create_database_option_formats));
+		DefElemOptionToStatement(buf, option, createDatabaseOptionFormats,
+								 lengthof(createDatabaseOptionFormats));
 	}
 }