Further updated function names to be more consistent and clash less with existing Clojure core nomenclature.