remove $name where not necessary to unify this in 2.x
also remove app ones
Merge pull request #1558 from dereuromark/2.4-unify-name

2.4 unify name