Refactor NamedStrings