updated for new naming convention