Renamed souce files of services to match port names
Merge pull request #160 from Gareth422/working

Renamed souce files of services to match port names