Updated the naming to follow guidelines, and set the default for 2.0 apps to false. Note that I inverted the naming, which means that I had to invert the logic in a few places.