Naming and typos