Fixed service naming.