Make the tests work again
Get rid of inflections, use CamelCased names everywhere