fixed naming, typos