re-fixed NamGen