This whole renaming thing annoys the hell out of me. This stuff should have been done correctly by 7.1 or you all should just live with modcluster, which, IMHO is a more-Java sounding name for the java side anyway.

I'm not going to block merging this patch over this, but it's a bunch of crap that users, doc writers etc have to deal with this kind of thing because now at this very late date y'all decide to get your shit together.