Changing the naming convention.