Changed the name of Entity_2 and entity

entity is now entity_old, Entity_2 is now entity