Changed data package names to be easier to read