Finally getting this revision controlled.
Fixed naming for BaseClassDescriptor2