replace NamedX structs with Named<X>