Remove $name where unnecessary - unifies code base.

Removes unnecessary code where possible. Unifies code base.