Add tablenames to models, clean up