Move the "rid_name" typedef to the only place where it might be used