Updated defect number and work order related var names