Fixed wording to match naming conventions