Yes, it has morphed over time through collaboration of the "intel" community interfacing with industry. Is it safe to assume that mass surveillance and control is fine with you as long as it's private companies doing it and providing the data to the government?
I believe it is one of the bases for why one side of the political divide makes the claim that this administration is somehow uniquely fascist, even though they are categorically wrong, but are responding to he ensnaring and strapping of corporations to the service of the government.