Clean App\Service names