Follow naming convention changes
Match changes for naming conventions