Simplifying names and correcting some rst grammar.