Most resources still use the NO_x tags. Update these to use the _x tags and then when done, update the resource:_template so that iftags are correct (by removing the deprecated ones for the NO_x tags).