remove $name where not necessary to unify this in 2.x