Different name for SWM6 water model.

Change-Id: I1a95268aefcceabee04d90fb644990bf14494a5c