Revised key names