Rename functions to match proposed PR coreos/rocket#276