Approprate naming for service protocol
Minor code cleanup