Renaming of the Client-/Serviceoperation. Many small changes.