cleanup a bunch of subtag things i missed, including a api name change