Naming tweaks, prevent direct access