[Encapsulation] getters/setters/etc

A few small improvements to encapsulation, and some changes in names to
improve coherence with docs