BUG-4638: rename LeafTypes to ConcreteTypes