rename package and modify the annotations