Rename class and test names

Based on comments from Chris Pitts (Guildford Coding Dojo)