Additional spec variable name changes
Add soft-delete functionality for cases