Engine swap 1996 into 1995

I have a low miles 1996 camry 4cyl engine and trans that I want to put into a 1995 camry.
It appears the distributer and some pollution control items are different.  The basic engine and transmission appear the same though.  I want to pull engine and trans in 95 and drop in the 96 engine and transmission.   Is there anyone who has swapped out these that can tell me what all I have to change to make this work?
 
Thanks for help
Marv