Move name and account_id to the correct place according to the spec