Add naming of the managed entity
Updates to address JavaDoc errors