Alter naming conventions