Changing markup.

protected methods and vars no longer have a preceding underscore in their names