Simple answer, yes to both.  Since the change in use is not significant, I would show a disposition at the UCC on the T777 and then add it to the T2125 at the UCC in assets rather than additions.  There is no real reason to give up half a year CCA for this type of transfer.  It is business use to business use, no change in ownership.  You are really just clearing out the employment form and adding the self-employment form.