rename services for consistency
Merge with masyer