Rename package files for more meaningful