SOAP-955 Change the artifact names to proper (capital S) versions
Also some minor clean up

Conflicts:
	pom.xml