OFC-1408 Changed the name of the code list FK from "codeName_code_id" to
"codeName_id"