The naming in the diff seems to be just fine to me - even when using an IDE.

And yeap, having classes with the same name is messy: that screenshot shows it clearly...