fix various typos
naming inconsistencies, fixes issue #3