Rename methods to match their intended action name.
Replace static #UNTRANSLATED tags by dynamic ones.
Minor formatting.