Changed Naming Scheme to be easier to follow
Fixed remaining unchanged variables, etc.