Updated some private class names for legability.