Rename ready for split of simple package into env and read