Refactoring naming convention once again

Refactoring code.

Merge request reports

Loading