naming converntions reworked