Rename command line tool, simplify build diff