Tweak naming and access specifiers