Translation keys reorganized