Fixed the naming conventions as per the app selected