Adapted to 7.2.X releases by changing multiple file, class, and b-tagging names