Changed naming to match e.g. densitywater.