Fixup 8d61a3d, use scope var naming convention on aliases.

Also remove unnecessary aliases.