diversified entities
Complete naming rework