#90: refactoring/renaming completed