[TASK] Update fluid namespace
Merge pull request #228 from coding46/UpdateFluidNamespace

[TASK] Update fluid namespace