Fixed renaming error.
Fixed stuff for Sphinx.