Some item name fixes.
Revamped I18N class