NEXUS-6164: Applied renames and tweaks