Refactor for resource bundle consistency