Bringing class names to common convention
Oops, accidental sharing of array pointers...