Restore underscore convention for protected/private methods
Restore underscore convention for protected/private vars