Rename services
Refactory fragment