Fixed evil names for classes