Rename keywords used as column names in API and PAP JPA

No match.