Converted keys to v2 keys