Change to the new naming scheme