Changed the name of two of the variables.

To show they should be accessed via the methods.
Changed the templates to use the pre-compiled queries.

Showed a speed up of over 50% on my laptop.