Fix on issue ITTE-451

Minor changes on method names and task 2.