Added name_table, left make_name_table unimplemented.