Updated to new Moxie representation naming conventions