Finished fixing of name to name_t