Fix final bit of new naming scheme