Reapplying original fix for reapplying namingpref

fixes #39