FLUID-4907: some further builder refactoring

Continued refactoring of the builder to properly name the two assembled grades.