CSPACE-6239: Update remaining service and command references that were overlooked during recent refactoring.