Made slosh a little more splashy
More name clean up