Engine swap 95 to 97

Hi, I need some information on an engine swap from a 1995 aurora 4.0L to a 1997 aurora 4.0L. Engine blocks are the same but there seem to be different plugins for the electrical. Can it be done without making a mess out of the eletrical. Thanks for helping out........