                          all-contacts)]
     (for [contact contacts]
       (let [organization-name (u/with-default (value-of contact "OrganizationName") sanitize?)
-            short-name (validate-short-name organization-name)
-            long-name (if (truncate-short-name? organization-name) organization-name nil)]
+            short-name (u/truncate-with-default
+                        organization-name u/SHORTNAME_MAX (truncate-short-name? organization-name))
+            long-name (when (truncate-short-name? organization-name) organization-name)]
        {:Roles (remove nil? (u/map-with-default echo10-contact-role->umm-data-center-role
                                                [(value-of contact "Role")]
                                                default-data-center-role

                   (= (:ShortName %) center))
             data-centers)
       {:Roles [center-role]
        :ShortName center
        :LongName long-name}))))

(defn parse-data-centers

  center-role - role for the data center"
  [doc data-centers center-name center-role]
  (let [center (value-of doc (str "/Collection/" center-name))
        short-name (u/truncate-with-default
                    center u/SHORTNAME_MAX (truncate-short-name? center))
        long-name (when (truncate-short-name? center) center)]
    (if center
      ;; Check to see if we already have an entry for this data center - the role and short name
      ;; match. If so, don't create a new record.
