After the bug fix related to database name length reverted the database name to original. Part of #2347.