service logic changes, proper prefixing

Call setup and teardown are working fine. Need to do some clean up
around session invalidation.
cosmetic changes