rename classes

FLOWER class will have errors until Ben's checkin