Class renaming, documentation, config updates