removed silly CLI, made names consistent