Handle sm- or missing prefix on extract.
Account for possible name-change.