new names for ALL classes to avoid conflicts