rename some classes
added some comments
DRILL-230: address additional code review comments