Refractering package names