Cleanup for new names.ActionTag refactor

hide implementation details more, rearrange code layout, simplify