One more note on this.. fernly and others have correctly pointed out that these did come about as different theories, but there are physicists who have come to believe they are the same thing.