Fixed service names

I renamed the source files to match the names of the ports. Ignore the double-commit.