Removed string_type from uri member typedefs.
Improved references in terms and definitions.