adjust some weird double-pluralised PK column names