Renamed providers to Constant and CurrentProvider