Refactor class names, change attribute to compliance_type