Fix some typos + naming conventions