Further renamed Rfc3986Encoder to Rfc3986
Some more renaming