Fixed severe naming conflicts in controllers, models and tables