More naming functionalities. Shold work now