Put back the downstream key_name change that was somehow
removed during the most recent upstream merge