Bug fix and naming convention change

Fixed bug where don't track admin meant no pages were tracked
Updated naming to reflect new styles.