Fixed fragment naming so they don't overlap