Added fixed database table names to all entities