Update copyright, license to be consistent

Update copyright, license to be consistent …
Also, add defined or die where missing