Missed a couple SYSTEM_ prefixes
Merge pull request #524 from cnelissen/SystemPackageConstantsFix

System package constants fix

* cnelissen/SystemPackageConstantsFix:
  Missed a couple SYSTEM_ prefixes
  Moved global constants to class constants