Added NameManager, for managing names of entities. Also added methods for backward compatibility.