EPG-34340, EPG-34558: rename methods, parameters and types for better understanding