Rename external facing values