Added names to entities