Renamed activities to avoid overwriting classes. Added some default
mapping stuff.