2.4 unify name

We can drop those lines as they are unnecessary. Unifies it across 2.x.
Less lines of code = more readability for the useful code.
Also makes the remaining $name properties more meaningful as they actually serve a purpose (re-aliasing etc).