Fixed fragments

Renamed everything to the original names (from new project autogenerated
code).