name clean up of constants
added donor category and donation type