More naming changes

Naming things is hard
Tests for statistics