Changed enum names to suit new board