Update naming convention to fix sorting bug