Adding entity system and changing naming convention