Rename removing 'edition' when not needed affinitic refs #5922