Rename Service

Change-Id: I8fea3ba2cd734b3131d800f28e2dd25c26100efb