follow new naming convention