SampleData changes &  some renaming