Use app names

Use app names to prevent global namespace pollution