Rename and remove some method in the base model