Simplify unit treatment, change names in GUI and exes