Changing the name of the breakpoint variables to bp for succinctness
Merging in with latest branch - name changes