java doc update also some more consistency with method names