Rearrange package names