Renamed proxy types to be more intuitive. Support for Enums.

Signed-off-by: Patrick Hogan <pbhogan@gmail.com>