Naming strategy + typos