Changing some naming conventions