Small tweaks to naming/localization