Still renaming variable names.
After refactorings, the project compiles and every test passes.