[CH,PO]{refactoring} I6 - Refactoring of field names