Cleanup on module names, descriptions.
Land #1935, @todb-r7's description cleanup