Removed client references, made generic app names