Changed handling of company and application name.