Changed names to be more close to exercises