Rename the positive, negative and collapsed margin methods.
Created attachment 69159 [details] Patch
Fixed in r68626.