diff --git a/cmd/spream/main.go b/cmd/spream/main.go
index 58299f6..a717d0a 100644
--- a/cmd/spream/main.go
+++ b/cmd/spream/main.go
@@ -62,7 +62,7 @@ Options:
 
 	fs.StringVar(&flags.database, "database", "", "")
 	fs.StringVar(&flags.streamName, "stream", "", "")
-	fs.StringVar(&flags.metadataTableName, "metadata-table", flags.database, "")
+	fs.StringVar(&flags.metadataTableName, "metadata-table", "", "")
 	fs.StringVar(&flags.metadataDatabase, "metadata-database", flags.database, "")
 	fs.DurationVar(&flags.heartbeatInterval, "heartbeat-interval", 10*time.Second, "")
 
@@ -79,6 +79,9 @@ Options:
 		fs.Usage()
 		return nil, errors.New("database and stream is required")
 	}
+	if flags.metadataDatabase == "" {
+		flags.metadataDatabase = flags.database
+	}
 
 	if start != "" {
 		t, err := time.Parse(time.RFC3339, start)
diff --git a/partition_metadata.go b/partition_metadata.go
index b4ad2a1..59f8d2b 100644
--- a/partition_metadata.go
+++ b/partition_metadata.go
@@ -20,10 +20,10 @@ type PartitionMetadata struct {
 type State string
 
 const (
-	StateCreated   State = "Created"
-	StateScheduled State = "Scheduled"
-	StateRunning   State = "Running"
-	StateFinished  State = "Finished"
+	StateCreated   State = "CREATED"
+	StateScheduled State = "SCHEDULED"
+	StateRunning   State = "RUNNING"
+	StateFinished  State = "FINISHED"
 )
 
 const (