WIP: Rename & Reorder based on ECMA specfication