Move constraint appending to policy.h, standardize naming
Standardize more naming for policy.h