use new naming convention