Various renames for field name collisions and other minor common sense#153

shana merged 1 commit intomastergithub-for-unity/Unity:masterfrom

fixes/instance-variable-collisionsgithub-for-unity/Unity:fixes/instance-variable-collisionsCopy head branch name to clipboard