ENH #4163 Fixed class renaming, expanded docs