CiviCase - Fix naming inconsistencies