updated class names and related docs