Renamed variables
Merge branch 'compare-filter' of https://github.com/haavardlian/UbiSolar into compare-filter