AASYST-1118: refactoring (replace company with instance)