Use service names rather than code names. Add montoring

Change-Id: If3c0a1c9c369b39ec62c8b53da7c21d690b56832