Clean the tool and format names
Authored by: Johannes Binder 2014-06-02
Parent(s): [4bfb30]
Child(ren): [d3dd34]