                         (fill-by-spec
                          (->> member-of-unit :fill :spec)
                          count
-                         "expression_import"
+                         "expression"
                          (->> member-of-unit :fill :source-model)
                          (->> member-of-unit :fill :target-model))))
                     (if (:fill-one-language member-of-unit)

(defn process [units target-language]
  (log/debug "Starting processing with: " (.size units) " instruction(s) for language " target-language)

  ;; cleanup: TODO: use temporary tables
  (let [import_table (str "expression_import_" target-language "_" (rand-int 1000000))
        expression_distinct_table (str "expression_distinct_" target-language "_" (rand-int 1000000))]

    ;; cleanup: TODO: use temporary tables
    (exec-raw (str "DROP TABLE IF EXISTS " import_table))

    (exec-raw (str "CREATE TABLE " import_table " (
    language text,
    model text,
    surface text,
    structure jsonb,
    serialized text)"))

    (log/debug (str "truncating import_table: " import_table))
    (exec-raw [(str "TRUNCATE " import_table)])

    (log/debug (str "Units: " (.size units)))
    (.size (map (fn [unit]
                  (log/trace (str "TYPE OF UNIT: " (type unit)))

                        (fill-language-by-spec
                         (->> member-of-unit :fill-one-language :spec)
                         count
                         "expression"
                         (->> member-of-unit :fill-one-language :model))))
                    (if (:fill-verb member-of-unit)
                      (do
