renames and more cleanup, working towards integration with latest db schema