Some changes to the new fluid names.