Adjust instrumentation to only work via the RSVP namespace

This should satisfy @domenics OCD.