Improved names for some class (removed reference to 'OnionDB', better readability)