Stem model templates are named inconsistently from the models that use them/the block IDs and states

The growth states for these are called stem_growth[age] and the attached version is called stem_fruit, but the melon and pumpkin stem models that point to these are called [species]_stem_stage[age] and attached_[species]_stem.

Shouldn't the former models be changed to be correct in their names (and have "template_" before their names as well)?