Naming changes in some functions. All updated up to 'ds.list' inclusive.