Refactoring: several rename operations

Several symbols were named in a wrong way - fixed