Rename sampling functions; depreciate old names