Fix tooling aliases