[DF-4215] Fixed unwanted rename of aggregators and screens after being copied. Fixed defect with controls library.