Merge "fixing invalid database name"