finishing replacement of %Name% with INTRINSICS.NAME