changed define names