aligning some naming conventions for test sample data.