Consolidated key names