naming problems
fix and migrate db