Minor improvements for translatable strings plus some renaming