Unify our structs to subsystem_name_t format