Fixing typos and changing - to _ to be consistent.