Fixing up some member names that were colliding and allowing field
proxies to be cloned