updated to new naming convention