calvinism: the theological system of John Calvin and his followers emphasizing omnipotence of God and salvation by grace alone
protestantism: the theological system of any of the churches of western Christendom that separated from the Roman Catholic Church during the Reformation