Some modifications to data name