Use change-case to handle naming conventions
Get the tests passing