Restructuring and name update