                           :catalog_item_identity {:name "coll1 ACL"
                                                   :provider_id "PROV1"
                                                   :collection_applicable true
-                                                  :collection_identifier {:entry_titles [(:entry-title coll1)]}}})
+                                                  :collection_identifier {:entry_titles [(:EntryTitle coll1)]}}})
     (ac/create-acl token {:group_permissions [{:user_type "guest"
                                                :permissions ["read"]}]
                           :catalog_item_identity {:name "coll1/coll2 ACL"
                                                   :provider_id "PROV1"
                                                   :collection_applicable true
-                                                  :collection_identifier {:entry_titles [(:entry-title coll1) (:entry-title coll2)]}}})
+                                                  :collection_identifier {:entry_titles [(:EntryTitle coll1) (:EntryTitle coll2)]}}})
     (index/wait-until-indexed)
     ;; Verify that the ACLs are found in Access Control Service search.
     (let [results (:items (ac/search-for-acls (transmit-config/echo-system-token) {:identity_type "catalog_item"}))]
       (is (= [1 1] (map :revision_id results)))
       (is (= ["coll1 ACL" "coll1/coll2 ACL"] (map :name results))))
     ;; Delete the collection via ingest.
-    (ingest/delete-concept (d/item->concept coll1 :echo10))
+    (ingest/delete-concept (d/umm-c-collection->concept coll1 :echo10))
     (index/wait-until-indexed)
     ;; Verify that those ACLs are NOT found.
     (let [results (:items (ac/search-for-acls (transmit-config/echo-system-token) {:identity_type "catalog_item"}))]
       (is (= [2] (map :revision_id results)))
       (is (= ["coll1/coll2 ACL"] (map :name results)))
-      (is (= [(:entry-title coll2)]
+      (is (= [(:EntryTitle coll2)]
              (-> (ac/get-acl token (:concept_id (first results)))
                  :catalog_item_identity
                  :collection_identifier
                  :entry_titles))))))
 
 (deftest delete-deleted-collection-with-new-revision-id-returns-404
-  (let [coll (d/ingest "PROV1" (dc/collection))
+  (let [coll (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection))
         concept-id (:concept-id coll)
-        native-id (:entry-title coll)
-        coll-del1 (ingest/delete-concept (d/item->concept coll :echo10) {:revision-id 5})
-        coll-del2 (ingest/delete-concept (d/item->concept coll :echo10) {:revision-id 7})]
+        native-id (:EntryTitle coll)
+        coll-del1 (ingest/delete-concept (d/umm-c-collection->concept coll :echo10) {:revision-id 5})
+        coll-del2 (ingest/delete-concept (d/umm-c-collection->concept coll :echo10) {:revision-id 7})]
     (is (= 200 (:status coll-del1)))
     (is (= 404 (:status coll-del2)))
     (is (= [(format "Concept with native-id [%s] and concept-id [%s] is already deleted."

(deftest update-collection-with-different-formats-test
  (testing "update collection in different formats ..."
    (doseq [[expected-rev coll-format] (map-indexed #(vector (inc %1) %2) [:echo10 :dif :dif10 :iso19115 :iso-smap])]
      (let [coll (d/ingest "PROV1"
                           (dc/collection {:short-name "S1"
                                           :version-id "V1"
                                           :entry-title "ET1"
                                           :long-name "L4"
                                           :summary (name coll-format)
                                           ;; The following fields are needed for DIF to pass xml validation
                                           :science-keywords [(dc/science-keyword {:category "upcase"
                                                                                   :topic "Cool"
                                                                                   :term "Mild"})]
                                           :organizations [(dc/org :distribution-center "Larc")]
                                           ;; The following fields are needed for DIF10 to pass xml validation
                                           :beginning-date-time "1965-12-12T12:00:00Z"
                                           :ending-date-time "1967-12-12T12:00:00Z"})
                           {:format coll-format})]
        (index/wait-until-indexed)
        (is (= expected-rev (:revision-id coll)))


;; Verify old DeleteTime concept results in 400 error.
(deftest old-delete-time-collection-ingest-test
  (let [coll (data-umm-c/collection {:DataDates [(umm-cmn/map->DateType {:Date (p/parse-datetime "2000-01-01T12:00:00Z")
                                                                        :Type "DELETE"})]})
        {:keys [status errors]} (ingest/ingest-concept
                                  (d/umm-c-collection->concept (assoc coll :provider-id "PROV1") :echo10))]
    (index/wait-until-indexed)
    (is (= status 422))
    (is (re-find #"DeleteTime 2000-01-01T12:00:00.000Z is before the current time." (first errors)))))
