Name refactoring, and example one completed