some renaming and edn-utils