Added ENOUGH-NAMESTRING + NATIVE-NAMESTRING handling