fixed naming issues. all working for part 4