Merge "Fix naming of key"