changed some Incident field/method names