#135 Add ExpiryPolicy suffix to concrete classes