fix problem on camel case and rebase db migration