Temporarily unhook the watermark to reapply it after the burst section
Minor file renaming to try to simplify things