Make the value used for 'f' in KDM names consistent (#1657).