Changed the names to make it more clear what the exercies are teaching. I also finished up another exercise :)