Board Thread:Show-Related Questions and Answers/@comment-30389283-20170517134655/@comment-31564770-20170517142104

Gold did wake up when he heard Emma's name, but I think he did go back under the curse. He had to have built in the wake up call before the curse was cast in order for it to work cuz it's a magic thing. He could've done it while he was modifying the curse (when he added a drop of his true love potion to it) to suit his needs before giving it to Regina. It's thus totally likely that he built in some subconscious trigger for his new self at the same time so he would pick Henry for Regina's adoption.