Rename in prep for further Chapter 4 work
Keep evaluator (without analyzer) around for work on future chapters