And the 540i moved to 4.4L in 97, I think, but kept it's 540 designation.

I've driven a 528 manual and a 540i wagon auto. That auto wasn't the quickest car, but still a lot of fun! And the best auto trans I've driven.