Updated more components to reflect new terminology when using Ratchet components
Updating namespacing and conventions as per ticket #1