Initial iOS 8 support.

- Renaming
- Some minor changes