Spruce up

RawImport name replacements