fix primary key names