Revert "fix db create syntax for avoiding name collisions"

This reverts commit 107cd779aa95fbcf1b0f52d7d02f83ea2e25f4fa.