Adhere to new naming convention