1974 911s - Connecting Sunroof Motor

[packyb]

I have a 1974 911S. The rear of the sunroof was sitting a little low, and the Porsche specialist working on the car tried multiple adjustments, and discovered that the motor must be too weak to properly close. He suggested that I track down a new motor - and it should be a snap for me to replace (he'd be happy to do it, but was trying to help me out $$ bcs. it's such a simple job).

So, I tracked down a new-to-me motor, and as I am going to install it, I noticed that the blue and yellow wires on the new (and old) motors have female spade terminals. The problem is that the wires in the Porsche also are female spade connectors! The previous owner just slid one side of each female connector over each other and taped them.

Question: 1) I'm assuming that the wires currently installed on the 911S aren't original (as I believe they are supposed to be male spade terminals)?, 2) Should I just cut / crimp those installed wires with male spade terminals?, and 3) if so, how do i determine which wires to connect the blue/yellow wires on the sunroof motor - as both of the wires in the Porsche are black?

Thanks in advance!