Fix spelling error and naming consistancy