Minor improvements for translatable strings plus some renaming
Rename
Minor improvements for translatable strings