Attempting to change some things to pass on TravisCI...even though I'm not getting any unit test failures.
Updated more components to reflect new terminology when using Ratchet components