issue 79: variables renaming