Updated with new naming convention