[4.0] Remove Target_Name Dependency