clean up of fully-qualified names