updated conventions in places.