Fix up rename error.
Added file name to breakpoints and instrumented buffers.