Change labels based on new schema