Rename keys for 7.0