Harmonize naming and language.