Changed class names for consistency and succinctness.
Fixing stupid proxy bug.
Fixing stupid indenting with bits.