[4.0] Remove target_name Dependency