Update home item template names to be consistent
- Fix some typos