OGM-454 Reverting changed visibility of some types/members