Minor updates - fixed some of the names