Cacher is the code snippet organizer for pro developers

customer.xml (Original)

    <customer_address_index translate="label">
        <label>Customer My Account Address Book</label>
        <!-- Mage_Customer -->
        <update handle="customer_account"/>
        <reference name="my.account.wrapper">
            <block type="customer/address_book" name="address_book" template="customer/address/book.phtml"/>
        </reference>
    </customer_address_index>

    <customer_address_form translate="label">
        <label>Customer My Account Address Edit Form</label>
        <!-- Mage_Customer -->
        <update handle="customer_account"/>
        <reference name="my.account.wrapper">
            <block type="customer/address_edit" name="customer_address_edit" template="customer/address/edit.phtml"/>
        </reference>
    </customer_address_form>


onepagecheckout.xml (Alterado)

    <customer_address_form translate="label">
        <reference name="my.account.wrapper">
            <block type="customer/address_edit" name="customer_address_edit" template="onepagecheckout/persistent/customer/address/edit.phtml"/>
        </reference>
    </customer_address_form>

    <customer_address_index translate="label">
        <reference name="my.account.wrapper">
            <block type="customer/address_book" name="address_book" template="onepagecheckout/persistent/customer/address/book.phtml"/>
        </reference>
    </customer_address_index>