Simplify target names