Renaming NGO and supporter to legal entity and individual, respectively