NEXUS-5472: Renamed II

I totally missed UTs...

Sigh.