Unify the syntax in the tools module