Remove $name where unnecessary - unifies code base.
Merge pull request #2442 from dereuromark/3.0-cleanup

Remove $name where unnecessary - unifies code base.