Fixed some conflicts

Code referenced certain tabs that have since been renamed