refactor(rename): add $ to names of services and factories
Merge remote-tracking branch 'origin/v0.4' into v0.4