Basic typos and naming stuff