--- title: Fix inconsistent naming for services that delete things merge_request: 5803 author: dixpac