change website from tinyusb.net to tinyusb.org

96 files changed, 96 insertions, 96 deletions

diff --git a/demos/bsp/boards/board.c b/demos/bsp/boards/board.c
index ae88c39f5..f534364ef 100644
--- a/demos/bsp/boards/board.c
+++ b/demos/bsp/boards/board.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h
index b64c0adf1..1ae1fb6af 100644
--- a/demos/bsp/boards/board.h
+++ b/demos/bsp/boards/board.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_at86rf2xx.c b/demos/bsp/boards/board_at86rf2xx.c
index 07471b99f..6ba93d463 100644
--- a/demos/bsp/boards/board_at86rf2xx.c
+++ b/demos/bsp/boards/board_at86rf2xx.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_at86rf2xx.h b/demos/bsp/boards/board_at86rf2xx.h
index 0961e626c..a397bd124 100644
--- a/demos/bsp/boards/board_at86rf2xx.h
+++ b/demos/bsp/boards/board_at86rf2xx.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_ea4357.c b/demos/bsp/boards/board_ea4357.c
index a019645d0..01f5b3c60 100644
--- a/demos/bsp/boards/board_ea4357.c
+++ b/demos/bsp/boards/board_ea4357.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_ea4357.h b/demos/bsp/boards/board_ea4357.h
index 1b27ba13b..ce4d482ea 100644
--- a/demos/bsp/boards/board_ea4357.h
+++ b/demos/bsp/boards/board_ea4357.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_lpcxpresso1347.c b/demos/bsp/boards/board_lpcxpresso1347.c
index 5e5d276fa..815b83e5d 100644
--- a/demos/bsp/boards/board_lpcxpresso1347.c
+++ b/demos/bsp/boards/board_lpcxpresso1347.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_lpcxpresso1347.h b/demos/bsp/boards/board_lpcxpresso1347.h
index badaa52f7..329415a23 100644
--- a/demos/bsp/boards/board_lpcxpresso1347.h
+++ b/demos/bsp/boards/board_lpcxpresso1347.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/board_ngx4330.c b/demos/bsp/boards/board_ngx4330.c
index 8496638cc..16179b7ca 100644
--- a/demos/bsp/boards/board_ngx4330.c
+++ b/demos/bsp/boards/board_ngx4330.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/bsp/boards/printf_retarget.c b/demos/bsp/boards/printf_retarget.c
index 501213a3a..6204db48d 100644
--- a/demos/bsp/boards/printf_retarget.c
+++ b/demos/bsp/boards/printf_retarget.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/device/keyboard/descriptors.c b/demos/device/keyboard/descriptors.c
index 9f252bd45..585f537a2 100644
--- a/demos/device/keyboard/descriptors.c
+++ b/demos/device/keyboard/descriptors.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/device/keyboard/descriptors.h b/demos/device/keyboard/descriptors.h
index f18ba04d7..8e6b62510 100644
--- a/demos/device/keyboard/descriptors.h
+++ b/demos/device/keyboard/descriptors.h
@@ -3,7 +3,7 @@
  *
  *  Created on: Nov 26, 2012
  *      Author: hathachtware License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)All rights reserved.
+ * Copyright (c) 2012, hathach (tinyusb.org)All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
diff --git a/demos/device/keyboard/makefile b/demos/device/keyboard/makefile
index 42fe3bbb8..8fa92b54d 100644
--- a/demos/device/keyboard/makefile
+++ b/demos/device/keyboard/makefile
@@ -1,6 +1,6 @@
 #######################################################################################
 # Software License Agreement (BSD License)
-# Copyright (c) 2012, hathach (tinyusb.net)
+# Copyright (c) 2012, hathach (tinyusb.org)
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/device/keyboard/tusb_config.h b/demos/device/keyboard/tusb_config.h
index 1d90033b3..3c1a2cbf2 100644
--- a/demos/device/keyboard/tusb_config.h
+++ b/demos/device/keyboard/tusb_config.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/host/keyboard_app.c b/demos/host/keyboard_app.c
index 0a8a78816..bc75c6331 100644
--- a/demos/host/keyboard_app.c
+++ b/demos/host/keyboard_app.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/host/keyboard_app.h b/demos/host/keyboard_app.h
index 060adc3bf..8b5de350f 100644
--- a/demos/host/keyboard_app.h
+++ b/demos/host/keyboard_app.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/demos/host/tusb_config.h b/demos/host/tusb_config.h
index 3a1f6c0d0..1ef980a45 100644
--- a/demos/host/tusb_config.h
+++ b/demos/host/tusb_config.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_ehci_init.c b/tests/test/host/ehci/test_ehci_init.c
index 99ade4e95..e83827be5 100644
--- a/tests/test/host/ehci/test_ehci_init.c
+++ b/tests/test/host/ehci/test_ehci_init.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_ehci_isr.c b/tests/test/host/ehci/test_ehci_isr.c
index c25a2a8f3..ebf6f5942 100644
--- a/tests/test/host/ehci/test_ehci_isr.c
+++ b/tests/test/host/ehci/test_ehci_isr.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_ehci_structure.c b/tests/test/host/ehci/test_ehci_structure.c
index 744c8d53f..b024094dc 100644
--- a/tests/test/host/ehci/test_ehci_structure.c
+++ b/tests/test/host/ehci/test_ehci_structure.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
index 5931bcd83..b1417c388 100644
--- a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
+++ b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_bulk_open.c b/tests/test/host/ehci/test_pipe_bulk_open.c
index 170a9ceac..abbfc8675 100644
--- a/tests/test/host/ehci/test_pipe_bulk_open.c
+++ b/tests/test/host/ehci/test_pipe_bulk_open.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_bulk_xfer.c b/tests/test/host/ehci/test_pipe_bulk_xfer.c
index 14d2b27a7..ad34530a5 100644
--- a/tests/test/host/ehci/test_pipe_bulk_xfer.c
+++ b/tests/test/host/ehci/test_pipe_bulk_xfer.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_control_open.c b/tests/test/host/ehci/test_pipe_control_open.c
index d67e1f352..32a1382aa 100644
--- a/tests/test/host/ehci/test_pipe_control_open.c
+++ b/tests/test/host/ehci/test_pipe_control_open.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_control_xfer.c b/tests/test/host/ehci/test_pipe_control_xfer.c
index 700762ca2..4494d225a 100644
--- a/tests/test/host/ehci/test_pipe_control_xfer.c
+++ b/tests/test/host/ehci/test_pipe_control_xfer.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_interrupt_open.c b/tests/test/host/ehci/test_pipe_interrupt_open.c
index 18d36ff33..ec9d48c14 100644
--- a/tests/test/host/ehci/test_pipe_interrupt_open.c
+++ b/tests/test/host/ehci/test_pipe_interrupt_open.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/ehci/test_pipe_isochronous_open.c b/tests/test/host/ehci/test_pipe_isochronous_open.c
index cb09e0ea8..803b1bcfb 100644
--- a/tests/test/host/ehci/test_pipe_isochronous_open.c
+++ b/tests/test/host/ehci/test_pipe_isochronous_open.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c
index 5f46c1536..f407e84df 100644
--- a/tests/test/host/test_enum_task.c
+++ b/tests/test/host/test_enum_task.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/test_hidh.c b/tests/test/host/test_hidh.c
index 3891034e5..f27a19b2c 100644
--- a/tests/test/host/test_hidh.c
+++ b/tests/test/host/test_hidh.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/test_hidh_keyboard.c b/tests/test/host/test_hidh_keyboard.c
index df8344008..5153a5f2d 100644
--- a/tests/test/host/test_hidh_keyboard.c
+++ b/tests/test/host/test_hidh_keyboard.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c
index 93f863e29..6c5a83ae8 100644
--- a/tests/test/host/test_usbh.c
+++ b/tests/test/host/test_usbh.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/descriptor_test.c b/tests/test/support/descriptor_test.c
index 7851716ad..3f288fba7 100644
--- a/tests/test/support/descriptor_test.c
+++ b/tests/test/support/descriptor_test.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/descriptor_test.h b/tests/test/support/descriptor_test.h
index 70694b1b7..24a45f10d 100644
--- a/tests/test/support/descriptor_test.h
+++ b/tests/test/support/descriptor_test.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/ehci_controller.c b/tests/test/support/ehci_controller.c
index 911a075d2..80e3c3c44 100644
--- a/tests/test/support/ehci_controller.c
+++ b/tests/test/support/ehci_controller.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/ehci_controller.h b/tests/test/support/ehci_controller.h
index 3df6111f9..c6fea6902 100644
--- a/tests/test/support/ehci_controller.h
+++ b/tests/test/support/ehci_controller.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/test_template.c b/tests/test/support/test_template.c
index aa022c27f..dc3a378b2 100644
--- a/tests/test/support/test_template.c
+++ b/tests/test/support/test_template.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/tusb_callback.h b/tests/test/support/tusb_callback.h
index 3d142e39d..c5e4ae259 100644
--- a/tests/test/support/tusb_callback.h
+++ b/tests/test/support/tusb_callback.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h
index ad3de6851..6ea154dea 100644
--- a/tests/test/support/tusb_config.h
+++ b/tests/test/support/tusb_config.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_assertion.c b/tests/test/test_assertion.c
index e09278141..0bd118e94 100644
--- a/tests/test/test_assertion.c
+++ b/tests/test/test_assertion.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_binary_const.c b/tests/test/test_binary_const.c
index 09d27acac..fc63f495f 100644
--- a/tests/test/test_binary_const.c
+++ b/tests/test/test_binary_const.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_fifo.c b/tests/test/test_fifo.c
index b5dd74bba..c30197688 100644
--- a/tests/test/test_fifo.c
+++ b/tests/test/test_fifo.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_osal_freeRTOS.c b/tests/test/test_osal_freeRTOS.c
index 437ba130c..2f908a145 100644
--- a/tests/test/test_osal_freeRTOS.c
+++ b/tests/test/test_osal_freeRTOS.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_osal_none.c b/tests/test/test_osal_none.c
index fc89184be..6c4018720 100644
--- a/tests/test/test_osal_none.c
+++ b/tests/test/test_osal_none.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tests/test/test_project_settings.c b/tests/test/test_project_settings.c
index 8977a9b95..9f706f8f6 100644
--- a/tests/test/test_project_settings.c
+++ b/tests/test/test_project_settings.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/WinCDCdriver.inf b/tinyusb/class/WinCDCdriver.inf
index 14af2be70..392016b13 100644
--- a/tinyusb/class/WinCDCdriver.inf
+++ b/tinyusb/class/WinCDCdriver.inf
@@ -99,7 +99,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="tinyusb.net"
+MFGNAME="tinyusb.org"
 INSTDISK="tinyUSB CDC driver"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/tinyusb/class/cdc.c b/tinyusb/class/cdc.c
index ca37d205f..52d782e38 100644
--- a/tinyusb/class/cdc.c
+++ b/tinyusb/class/cdc.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/cdc.h b/tinyusb/class/cdc.h
index e261967dd..012a646af 100644
--- a/tinyusb/class/cdc.h
+++ b/tinyusb/class/cdc.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/hid.c b/tinyusb/class/hid.c
index 255f94617..450f401b2 100644
--- a/tinyusb/class/hid.c
+++ b/tinyusb/class/hid.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index f658c4f97..cec54d1b7 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/hid_device.h b/tinyusb/class/hid_device.h
index fe2e838ee..607840f3b 100644
--- a/tinyusb/class/hid_device.h
+++ b/tinyusb/class/hid_device.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index e5b8ecfaf..e322349b5 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index e92da02b8..a61f56125 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c
index f4e8b5cd5..c6f0d1518 100644
--- a/tinyusb/class/msc_host.c
+++ b/tinyusb/class/msc_host.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/class/msc_host.h b/tinyusb/class/msc_host.h
index f6222197d..ff41a9e34 100644
--- a/tinyusb/class/msc_host.h
+++ b/tinyusb/class/msc_host.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h
index 6ac46086c..82a9c05fb 100644
--- a/tinyusb/common/assertion.h
+++ b/tinyusb/common/assertion.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/binary.h b/tinyusb/common/binary.h
index e9bd51e5e..938caf2a3 100644
--- a/tinyusb/common/binary.h
+++ b/tinyusb/common/binary.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index 323ff8ee8..3bc45f46b 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/compiler/compiler.h b/tinyusb/common/compiler/compiler.h
index 59f0ebaad..859cea74d 100644
--- a/tinyusb/common/compiler/compiler.h
+++ b/tinyusb/common/compiler/compiler.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/compiler/compiler_gcc.h b/tinyusb/common/compiler/compiler_gcc.h
index ac0238a8e..2db8b222f 100644
--- a/tinyusb/common/compiler/compiler_gcc.h
+++ b/tinyusb/common/compiler/compiler_gcc.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/compiler/compiler_iar.h b/tinyusb/common/compiler/compiler_iar.h
index 99a9005d8..932f10511 100644
--- a/tinyusb/common/compiler/compiler_iar.h
+++ b/tinyusb/common/compiler/compiler_iar.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/errors.c b/tinyusb/common/errors.c
index 3e71bd5db..2de115697 100644
--- a/tinyusb/common/errors.c
+++ b/tinyusb/common/errors.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h
index 3e481851e..fbb5a5901 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/errors.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/fifo.c b/tinyusb/common/fifo.c
index b968d9574..fe90b1fbd 100644
--- a/tinyusb/common/fifo.c
+++ b/tinyusb/common/fifo.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/fifo.h b/tinyusb/common/fifo.h
index 7295ae88a..efd53e43c 100644
--- a/tinyusb/common/fifo.h
+++ b/tinyusb/common/fifo.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/primitive_types.h b/tinyusb/common/primitive_types.h
index 063d6e443..0a645ef87 100644
--- a/tinyusb/common/primitive_types.h
+++ b/tinyusb/common/primitive_types.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/common/timeout_timer.h b/tinyusb/common/timeout_timer.h
index bd2fa28b7..f76b922bb 100644
--- a/tinyusb/common/timeout_timer.h
+++ b/tinyusb/common/timeout_timer.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/core/std_descriptors.h b/tinyusb/core/std_descriptors.h
index 17094fee5..433577a30 100644
--- a/tinyusb/core/std_descriptors.h
+++ b/tinyusb/core/std_descriptors.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/core/std_request.h b/tinyusb/core/std_request.h
index 189bc9c2c..06b94c3ca 100644
--- a/tinyusb/core/std_request.h
+++ b/tinyusb/core/std_request.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index 7238063d5..6a641930d 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index d66de9987..cd3c85063 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 1b5fc54b9..f533bd683 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/doxygen/license.md b/tinyusb/doxygen/license.md
index 842b51097..597d93939 100644
--- a/tinyusb/doxygen/license.md
+++ b/tinyusb/doxygen/license.md
@@ -1,7 +1,7 @@
 # License
 
 <pre>Software License Agreement (BSD License)
-Copyright (c) 2013, hathach (tinyusb.net)
+Copyright (c) 2013, hathach (tinyusb.org)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index f95d62ae9..a79ea4a16 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc11uxx.c b/tinyusb/hal/hal_lpc11uxx.c
index 29608e408..074e14675 100644
--- a/tinyusb/hal/hal_lpc11uxx.c
+++ b/tinyusb/hal/hal_lpc11uxx.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h
index b8acdec2a..ef7c056c2 100644
--- a/tinyusb/hal/hal_lpc11uxx.h
+++ b/tinyusb/hal/hal_lpc11uxx.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc13uxx.c b/tinyusb/hal/hal_lpc13uxx.c
index 4379bb86d..b9b2dadb9 100644
--- a/tinyusb/hal/hal_lpc13uxx.c
+++ b/tinyusb/hal/hal_lpc13uxx.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h
index aa319b228..af10a3d21 100644
--- a/tinyusb/hal/hal_lpc13uxx.h
+++ b/tinyusb/hal/hal_lpc13uxx.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc43xx.c b/tinyusb/hal/hal_lpc43xx.c
index 5d6a7f5ca..8cee945fc 100644
--- a/tinyusb/hal/hal_lpc43xx.c
+++ b/tinyusb/hal/hal_lpc43xx.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/hal/hal_lpc43xx.h b/tinyusb/hal/hal_lpc43xx.h
index 9afbf8bbd..cf8b5343f 100644
--- a/tinyusb/hal/hal_lpc43xx.h
+++ b/tinyusb/hal/hal_lpc43xx.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index 670a915d4..a8841545e 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/ehci/ehci.h b/tinyusb/host/ehci/ehci.h
index fdd991c04..ccaa454b4 100644
--- a/tinyusb/host/ehci/ehci.h
+++ b/tinyusb/host/ehci/ehci.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/hcd.c b/tinyusb/host/hcd.c
index e81809c87..daf457b97 100644
--- a/tinyusb/host/hcd.c
+++ b/tinyusb/host/hcd.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index e18cf3cc4..ab324b6d4 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 2a5102967..24c112bf6 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 3ed2a2ea9..00edf712a 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index 79f82cebe..fd3430042 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/license.txt b/tinyusb/license.txt
index 9d72736ac..608644f43 100644
--- a/tinyusb/license.txt
+++ b/tinyusb/license.txt
@@ -1,6 +1,6 @@
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/mcu_capacity.h b/tinyusb/mcu_capacity.h
index 8e05edcaf..574921330 100644
--- a/tinyusb/mcu_capacity.h
+++ b/tinyusb/mcu_capacity.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index 720375321..3208301a1 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h
index d896b2c01..ceb6d00fd 100644
--- a/tinyusb/osal/osal_common.h
+++ b/tinyusb/osal/osal_common.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h
index 887727bb0..aa899d60d 100644
--- a/tinyusb/osal/osal_freeRTOS.h
+++ b/tinyusb/osal/osal_freeRTOS.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
+ * Copyright (c) 2012, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/osal/osal_none.c b/tinyusb/osal/osal_none.c
index 4c8eb7aca..9f2cedfba 100644
--- a/tinyusb/osal/osal_none.c
+++ b/tinyusb/osal/osal_none.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h
index 27f460ed9..4fe78311d 100644
--- a/tinyusb/osal/osal_none.h
+++ b/tinyusb/osal/osal_none.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/tusb.c b/tinyusb/tusb.c
index 77678d779..6e7662aa9 100644
--- a/tinyusb/tusb.c
+++ b/tinyusb/tusb.c
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index b8f997573..7dcf06d12 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h
index d7cc8fab6..976e5fd08 100644
--- a/tinyusb/tusb_option.h
+++ b/tinyusb/tusb_option.h
@@ -7,7 +7,7 @@
 
 /*
  * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
+ * Copyright (c) 2013, hathach (tinyusb.org)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,