Updated the way company name and application name are handled.