Use the new naming conventions for keys.