Fix intersection code.

Tidy up class names.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>