Update SPS naming to include container name in service name.

We now use the last piece of the container name (this is also normally used as a the default) to differentiate from multiple containers in the same task definition.