NEXUS-5961: Renamed