Refactored the application names