Would fiance changing surname present a problem?

[Kukolka 8]

My fiance's legal surname is hyphenated, but other than on legal documents he goes by only one of those names. Let's say for this site that his legal last name is Smith-Jones, but he normally goes by Jones. He would like to legally change his surname to Jones. Then the plan is when we get married I change my surname to Jones.

My questions:

1. Is it ok for me to file the I-129F now, with his surname Smith-Jones; then he does a legal name change in Canada and we can send in to the USCIS some kind of form once it's changed, noting that, just like the Change of Address form? Or would him changing his name in Canada while the K-1 paperwork is going through present a problem?

2. If he keeps his name Smith-Jones for now, would we both be able to change our surnames to Jones in the States when we get married? Would that be the easier route?

I really do not want to wait to send in the forms, as we're aware of the processing time, and don't want to have to spend any more time apart than we have to. :/

[Kukolka 8]

Please disregard question 1; he's decided to not bother changing his name until after we're married. From what I can find, Connecticut does not have the space on the marriage form for a man to change his surname with the marriage, so the man must Petition if he wants to change his surname no matter what. And it looks like the space on the marriage certificate, if the state has it, would -only- be to change to the -spouse's- surname or a few other choices that do not apply to us. So we will both need to file petitions with probate court anyway. I'll need to see how much time that takes and see if we can do that between wedding and filing AOS... :s