Re adjusted naming scheme to a more service based scheme.
more name changes