Updated keys to match confluence.