Refactoring: renaming methods and variables, fix cancellation test cases

Denys Barabash requested to merge den/refactoring into master

Add for renewables variables specific name, fix cancellation test cases, remove from nadra excess methods

Merge request reports