Ilya Shaikovsky
committed
on 31 Jan 11
names correction + checkstyle fixes