Loads of renaming. Added AppCompat stuff.