Changing keys to Lowercase

Pull from upstream