SOC-2925 | Activity type improvement-Spaces activity-Reorganize code in case of rename and update description at the same time.