Refactoring - giving classes better names so their meaning is more clearer.