FLUID-5026: Some tidying and renaming work