Move 2.17's key renaming into 2.16