A fix for bug #8139.  I had two different classes named the same thing.  I had to change the name of one of them.