Updated var names to be easier to understand.
Merge pull request #1850 from openbaypro/master

Changes to install to auto enable / disable during install / uninstall