Some minor renamings
public -> protected for some methods