little change in comments due to previous class name change