Fix overzealous string replacement and missed references to settings module