Changed to follow Google Analythics reporting style/names

Think this is much cleaner. Closes #15