- added naming mechanism