Add table names to models, cleanup