diff --git a/openbsc/include/openbsc/bsc_msc.h b/openbsc/include/openbsc/bsc_msc.h
index 9454e07..49fe68c 100644
--- a/openbsc/include/openbsc/bsc_msc.h
+++ b/openbsc/include/openbsc/bsc_msc.h
@@ -1,7 +1,7 @@
 /* Routines to talk to the MSC using the IPA Protocol */
 /*
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index 9dd5b8f..d42e489 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -1,6 +1,6 @@
 /*
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/openbsc/src/bsc_msc.c b/openbsc/src/bsc_msc.c
index 160d31d..67ad4db 100644
--- a/openbsc/src/bsc_msc.c
+++ b/openbsc/src/bsc_msc.c
@@ -1,7 +1,7 @@
 /* Routines to talk to the MSC using the IPA Protocol */
 /*
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/nat/bsc_filter.c
index 051e530..d3de5f7 100644
--- a/openbsc/src/nat/bsc_filter.c
+++ b/openbsc/src/nat/bsc_filter.c
@@ -2,7 +2,7 @@
 
 /*
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c
index 09df4dc..791b282 100644
--- a/openbsc/src/nat/bsc_nat.c
+++ b/openbsc/src/nat/bsc_nat.c
@@ -2,7 +2,7 @@
 
 /*
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  * (C) 2009 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index 8d1bd9b..df9c5b9 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -2,7 +2,7 @@
  * BSC NAT Message filtering
  *
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010 by on-waves.com
+ * (C) 2010 by On-Waves
  *
  * All Rights Reserved
  *