Fixes company name issue

Fixes ticket DEV-3611