More consistency in naming
More consistency in naming

Signed-off-by: Bridget Kromhout <61985bf0e35b2b8a38cd67649d369553805e81b9@kromhout.org>

kubernetes/enhancements,kubernetes/enhancements,kubernetes/enhancements