Replacing the specific twoPhaseChangeModel with a consistent and general fvModel interface will support not just cavitation using the new VoFCavitation fvModel but also other phase-change and interface manipulation models in the future and is easier to use for case-specific and other user customisation.