Preparing for namechange
New rates and structures
Updated tests for the new rates