Re-factored names of functions and objects

as required in TDD presentation.