renamed several models and tables for more readability