Changed names for consistancy
Fixed names for consistancy