Customize changes according to new naming conventions