OGM-383 Aligning JavaDoc
OGM-383 Making method names more consistent