fix naming and misc typos