summaryrefslogtreecommitdiff
path: root/gr-atsc/src
diff options
context:
space:
mode:
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-13 21:30:04 +0000
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-13 21:30:04 +0000
commit86f5c92427b3f4bb30536d76cf63c3fca388fb2f (patch)
tree40c88e125aee9d66b2f8a7451a43e3eaf07da578 /gr-atsc/src
parent31750b16dc2676a323fb8bd4a933e166d81b547e (diff)
Updated FSF address in all files. Fixes ticket:51
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3534 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-atsc/src')
-rw-r--r--gr-atsc/src/Makefile.am4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop.h4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop2.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop2.h4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop3.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscBitTimingLoop3.h4
-rw-r--r--gr-atsc/src/lib/GrAtscConvert2xTo20.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscConvert2xTo20.h4
-rw-r--r--gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h4
-rw-r--r--gr-atsc/src/lib/GrAtscDeinterleaver.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscDeinterleaver.h4
-rw-r--r--gr-atsc/src/lib/GrAtscDerandomizer.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscDerandomizer.h4
-rw-r--r--gr-atsc/src/lib/GrAtscEqualizer.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscEqualizer.h4
-rw-r--r--gr-atsc/src/lib/GrAtscFPLL.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscFPLL.h4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncChecker.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncChecker.h4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncDemux.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncDemux.h4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncMux.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscFieldSyncMux.h4
-rw-r--r--gr-atsc/src/lib/GrAtscInterleaver.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscInterleaver.h4
-rw-r--r--gr-atsc/src/lib/GrAtscRSDecoder.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscRSDecoder.h4
-rw-r--r--gr-atsc/src/lib/GrAtscRSEncoder.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscRSEncoder.h4
-rw-r--r--gr-atsc/src/lib/GrAtscRandomizer.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscRandomizer.h4
-rw-r--r--gr-atsc/src/lib/GrAtscSegSymSync.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscSegSymSync.h4
-rw-r--r--gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscSegSymSyncImpl.h4
-rw-r--r--gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h4
-rw-r--r--gr-atsc/src/lib/GrAtscSymbolMapper.h4
-rw-r--r--gr-atsc/src/lib/GrAtscTrellisEncoder.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscTrellisEncoder.h4
-rw-r--r--gr-atsc/src/lib/GrAtscViterbiDecoder.cc4
-rw-r--r--gr-atsc/src/lib/GrAtscViterbiDecoder.h4
-rw-r--r--gr-atsc/src/lib/Makefile.am4
-rw-r--r--gr-atsc/src/lib/atsc_bit_timing_loop.cc4
-rw-r--r--gr-atsc/src/lib/atsc_bit_timing_loop.h4
-rw-r--r--gr-atsc/src/lib/atsc_consts.h4
-rw-r--r--gr-atsc/src/lib/atsc_deinterleaver.cc4
-rw-r--r--gr-atsc/src/lib/atsc_deinterleaver.h4
-rw-r--r--gr-atsc/src/lib/atsc_depad.cc4
-rw-r--r--gr-atsc/src/lib/atsc_depad.h4
-rw-r--r--gr-atsc/src/lib/atsc_derandomizer.cc4
-rw-r--r--gr-atsc/src/lib/atsc_derandomizer.h4
-rw-r--r--gr-atsc/src/lib/atsc_ds_to_softds.cc4
-rw-r--r--gr-atsc/src/lib/atsc_ds_to_softds.h4
-rw-r--r--gr-atsc/src/lib/atsc_equalizer.cc4
-rw-r--r--gr-atsc/src/lib/atsc_equalizer.h4
-rw-r--r--gr-atsc/src/lib/atsc_field_sync_demux.cc4
-rw-r--r--gr-atsc/src/lib/atsc_field_sync_demux.h4
-rw-r--r--gr-atsc/src/lib/atsc_field_sync_mux.cc4
-rw-r--r--gr-atsc/src/lib/atsc_field_sync_mux.h4
-rw-r--r--gr-atsc/src/lib/atsc_fpll.cc4
-rw-r--r--gr-atsc/src/lib/atsc_fpll.h4
-rw-r--r--gr-atsc/src/lib/atsc_fs_checker.cc4
-rw-r--r--gr-atsc/src/lib/atsc_fs_checker.h4
-rw-r--r--gr-atsc/src/lib/atsc_interleaver.cc4
-rw-r--r--gr-atsc/src/lib/atsc_interleaver.h4
-rw-r--r--gr-atsc/src/lib/atsc_randomizer.cc4
-rw-r--r--gr-atsc/src/lib/atsc_randomizer.h4
-rw-r--r--gr-atsc/src/lib/atsc_rs_decoder.cc4
-rw-r--r--gr-atsc/src/lib/atsc_rs_decoder.h4
-rw-r--r--gr-atsc/src/lib/atsc_rs_encoder.cc4
-rw-r--r--gr-atsc/src/lib/atsc_rs_encoder.h4
-rw-r--r--gr-atsc/src/lib/atsc_trellis_encoder.cc4
-rw-r--r--gr-atsc/src/lib/atsc_trellis_encoder.h4
-rw-r--r--gr-atsc/src/lib/atsc_types.h4
-rw-r--r--gr-atsc/src/lib/atsc_viterbi_decoder.cc4
-rw-r--r--gr-atsc/src/lib/atsc_viterbi_decoder.h4
-rw-r--r--gr-atsc/src/lib/atsci_basic_trellis_encoder.cc4
-rw-r--r--gr-atsc/src/lib/atsci_basic_trellis_encoder.h4
-rw-r--r--gr-atsc/src/lib/atsci_data_interleaver.cc4
-rw-r--r--gr-atsc/src/lib/atsci_data_interleaver.h4
-rw-r--r--gr-atsc/src/lib/atsci_diag_output.h4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer.cc4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer.h4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_lms.cc4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_lms.h4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_lms2.cc4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_lms2.h4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_nop.cc4
-rw-r--r--gr-atsc/src/lib/atsci_equalizer_nop.h4
-rw-r--r--gr-atsc/src/lib/atsci_exp2_lp.cc4
-rw-r--r--gr-atsc/src/lib/atsci_exp2_lp.h4
-rw-r--r--gr-atsc/src/lib/atsci_fake_single_viterbi.cc4
-rw-r--r--gr-atsc/src/lib/atsci_fake_single_viterbi.h4
-rw-r--r--gr-atsc/src/lib/atsci_fs_checker.cc4
-rw-r--r--gr-atsc/src/lib/atsci_fs_checker.h4
-rw-r--r--gr-atsc/src/lib/atsci_fs_checker_naive.cc4
-rw-r--r--gr-atsc/src/lib/atsci_fs_checker_naive.h4
-rw-r--r--gr-atsc/src/lib/atsci_fs_correlator.cc4
-rw-r--r--gr-atsc/src/lib/atsci_fs_correlator.h4
-rw-r--r--gr-atsc/src/lib/atsci_fs_correlator_naive.cc4
-rw-r--r--gr-atsc/src/lib/atsci_fs_correlator_naive.h4
-rw-r--r--gr-atsc/src/lib/atsci_pnXXX.cc4
-rw-r--r--gr-atsc/src/lib/atsci_pnXXX.h4
-rw-r--r--gr-atsc/src/lib/atsci_randomizer.cc4
-rw-r--r--gr-atsc/src/lib/atsci_randomizer.h4
-rw-r--r--gr-atsc/src/lib/atsci_reed_solomon.cc4
-rw-r--r--gr-atsc/src/lib/atsci_reed_solomon.h4
-rw-r--r--gr-atsc/src/lib/atsci_root_raised_cosine.cc4
-rw-r--r--gr-atsc/src/lib/atsci_root_raised_cosine.h4
-rw-r--r--gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc4
-rw-r--r--gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h4
-rw-r--r--gr-atsc/src/lib/atsci_single_viterbi.cc4
-rw-r--r--gr-atsc/src/lib/atsci_single_viterbi.h4
-rw-r--r--gr-atsc/src/lib/atsci_slicer_agc.h4
-rw-r--r--gr-atsc/src/lib/atsci_sliding_correlator.cc4
-rw-r--r--gr-atsc/src/lib/atsci_sliding_correlator.h4
-rw-r--r--gr-atsc/src/lib/atsci_sssr.cc4
-rw-r--r--gr-atsc/src/lib/atsci_sssr.h4
-rw-r--r--gr-atsc/src/lib/atsci_syminfo.h4
-rw-r--r--gr-atsc/src/lib/atsci_sync_tag.h4
-rw-r--r--gr-atsc/src/lib/atsci_trellis_encoder.cc4
-rw-r--r--gr-atsc/src/lib/atsci_trellis_encoder.h4
-rw-r--r--gr-atsc/src/lib/atsci_viterbi_decoder.cc4
-rw-r--r--gr-atsc/src/lib/atsci_viterbi_decoder.h4
-rw-r--r--gr-atsc/src/lib/atsci_viterbi_gen.cc4
-rw-r--r--gr-atsc/src/lib/atsci_vsbtx_lp.cc4
-rw-r--r--gr-atsc/src/lib/atsci_vsbtx_lp.h4
-rw-r--r--gr-atsc/src/lib/convolutional_interleaver.h4
-rw-r--r--gr-atsc/src/lib/create_atsci_equalizer.cc4
-rw-r--r--gr-atsc/src/lib/create_atsci_equalizer.h4
-rw-r--r--gr-atsc/src/lib/create_atsci_fs_checker.cc4
-rw-r--r--gr-atsc/src/lib/create_atsci_fs_checker.h4
-rw-r--r--gr-atsc/src/lib/create_atsci_fs_correlator.cc4
-rw-r--r--gr-atsc/src/lib/create_atsci_fs_correlator.h4
-rw-r--r--gr-atsc/src/lib/fpll_btloop_coupling.h4
-rwxr-xr-xgr-atsc/src/lib/gen_encoder.py4
-rw-r--r--gr-atsc/src/lib/interleaver_fifo.h4
-rw-r--r--gr-atsc/src/lib/plinfo.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_data_interleaver.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_data_interleaver.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_equalizer_nop.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_equalizer_nop.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_fs_correlator.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_fs_correlator.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_randomizer.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_randomizer.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_reed_solomon.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_reed_solomon.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_single_viterbi.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_single_viterbi.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_sliding_correlator.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_sliding_correlator.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_trellis_encoder.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_trellis_encoder.h4
-rw-r--r--gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc4
-rw-r--r--gr-atsc/src/lib/qa_atsci_viterbi_decoder.h4
-rw-r--r--gr-atsc/src/lib/qa_convolutional_interleaver.cc4
-rw-r--r--gr-atsc/src/lib/qa_convolutional_interleaver.h4
-rw-r--r--gr-atsc/src/lib/qa_interleaver_fifo.cc4
-rw-r--r--gr-atsc/src/lib/qa_interleaver_fifo.h4
-rw-r--r--gr-atsc/src/lib/test_atsci.cc4
-rw-r--r--gr-atsc/src/python/Makefile.am4
-rw-r--r--gr-atsc/src/python/atsc_utils.py4
-rwxr-xr-xgr-atsc/src/python/qa_atsc.py4
174 files changed, 348 insertions, 348 deletions
diff --git a/gr-atsc/src/Makefile.am b/gr-atsc/src/Makefile.am
index 122fc72c1f..79b2172910 100644
--- a/gr-atsc/src/Makefile.am
+++ b/gr-atsc/src/Makefile.am
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
SUBDIRS = lib python
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop.cc
index 9577dad2e2..8354dc308f 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cmath>
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.h b/gr-atsc/src/lib/GrAtscBitTimingLoop.h
index 3bb1adec19..7fd96a1156 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop.h
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCBITTIMINGLOOP_H_
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc
index 25eadd36c5..28da49d89d 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscBitTimingLoop2.h>
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h b/gr-atsc/src/lib/GrAtscBitTimingLoop2.h
index 19422344d3..2867ff896d 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop2.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCBITTIMINGLOOP2_H_
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc
index 2b21f2f0ac..d5cfee4355 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscBitTimingLoop3.h>
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h b/gr-atsc/src/lib/GrAtscBitTimingLoop3.h
index 299dc79d64..f6a411c8fb 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h
+++ b/gr-atsc/src/lib/GrAtscBitTimingLoop3.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCBITTIMINGLOOP3_H_
diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc b/gr-atsc/src/lib/GrAtscConvert2xTo20.cc
index 79811df385..6649feb2e5 100644
--- a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc
+++ b/gr-atsc/src/lib/GrAtscConvert2xTo20.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscConvert2xTo20.h>
diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.h b/gr-atsc/src/lib/GrAtscConvert2xTo20.h
index a8f802be4b..48b3e10d2f 100644
--- a/gr-atsc/src/lib/GrAtscConvert2xTo20.h
+++ b/gr-atsc/src/lib/GrAtscConvert2xTo20.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCCONVERT2XTO20_H_
#define _GRATSCCONVERT2XTO20_H_
diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc
index 577330ec2f..bb147e49e7 100644
--- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc
+++ b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscDataSegToSoftDataSeg.h>
diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h
index 0cab046f29..ef752fdffb 100644
--- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h
+++ b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCDATASEGTOSOFTDATASEG_H_
diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.cc b/gr-atsc/src/lib/GrAtscDeinterleaver.cc
index 2148e8aa7c..f0bb72d97b 100644
--- a/gr-atsc/src/lib/GrAtscDeinterleaver.cc
+++ b/gr-atsc/src/lib/GrAtscDeinterleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscDeinterleaver.h>
diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.h b/gr-atsc/src/lib/GrAtscDeinterleaver.h
index d4cb44e649..65cb398c40 100644
--- a/gr-atsc/src/lib/GrAtscDeinterleaver.h
+++ b/gr-atsc/src/lib/GrAtscDeinterleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCDEINTERLEAVER_H_
diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.cc b/gr-atsc/src/lib/GrAtscDerandomizer.cc
index 2cd7d39d02..f3cdc9dd4d 100644
--- a/gr-atsc/src/lib/GrAtscDerandomizer.cc
+++ b/gr-atsc/src/lib/GrAtscDerandomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscDerandomizer.h>
diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.h b/gr-atsc/src/lib/GrAtscDerandomizer.h
index 22888c28b5..23fb92047c 100644
--- a/gr-atsc/src/lib/GrAtscDerandomizer.h
+++ b/gr-atsc/src/lib/GrAtscDerandomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCDERANDOMIZER_H_
diff --git a/gr-atsc/src/lib/GrAtscEqualizer.cc b/gr-atsc/src/lib/GrAtscEqualizer.cc
index cd930adb89..092661a3b2 100644
--- a/gr-atsc/src/lib/GrAtscEqualizer.cc
+++ b/gr-atsc/src/lib/GrAtscEqualizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscEqualizer.h>
diff --git a/gr-atsc/src/lib/GrAtscEqualizer.h b/gr-atsc/src/lib/GrAtscEqualizer.h
index 46282bad90..896f2aeeb3 100644
--- a/gr-atsc/src/lib/GrAtscEqualizer.h
+++ b/gr-atsc/src/lib/GrAtscEqualizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCEQUALIZER_H_
diff --git a/gr-atsc/src/lib/GrAtscFPLL.cc b/gr-atsc/src/lib/GrAtscFPLL.cc
index e6a7ff63f1..8e2f5631ce 100644
--- a/gr-atsc/src/lib/GrAtscFPLL.cc
+++ b/gr-atsc/src/lib/GrAtscFPLL.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscFPLL.h>
diff --git a/gr-atsc/src/lib/GrAtscFPLL.h b/gr-atsc/src/lib/GrAtscFPLL.h
index 0868f9a0a8..6998a715b1 100644
--- a/gr-atsc/src/lib/GrAtscFPLL.h
+++ b/gr-atsc/src/lib/GrAtscFPLL.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc b/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc
index 18b81ac20f..b023c74171 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc
+++ b/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscFieldSyncChecker.h>
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h b/gr-atsc/src/lib/GrAtscFieldSyncChecker.h
index f64ebcb6a4..dad68916c5 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h
+++ b/gr-atsc/src/lib/GrAtscFieldSyncChecker.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCFIELDSYNCCHECKER_H_
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc
index 23eabe8e7f..87fa7336ea 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc
+++ b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscFieldSyncCorrelator.h>
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h
index 78ff9c6662..c85766a610 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h
+++ b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCFIELDSYNCCORRELATOR_H_
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc b/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc
index 04a39bd06b..4ed3ea43ef 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc
+++ b/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cmath>
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h b/gr-atsc/src/lib/GrAtscFieldSyncDemux.h
index 2eb6084b54..c32531cd41 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h
+++ b/gr-atsc/src/lib/GrAtscFieldSyncDemux.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCFIELDSYNCDEMUX_H_
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc b/gr-atsc/src/lib/GrAtscFieldSyncMux.cc
index 42921952ae..bace3d0dc1 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc
+++ b/gr-atsc/src/lib/GrAtscFieldSyncMux.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscFieldSyncMux.h>
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.h b/gr-atsc/src/lib/GrAtscFieldSyncMux.h
index 5235603ce8..76a8d5f4d6 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncMux.h
+++ b/gr-atsc/src/lib/GrAtscFieldSyncMux.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCFIELDSYNCMUX_H_
diff --git a/gr-atsc/src/lib/GrAtscInterleaver.cc b/gr-atsc/src/lib/GrAtscInterleaver.cc
index e766dcfca6..240cf67031 100644
--- a/gr-atsc/src/lib/GrAtscInterleaver.cc
+++ b/gr-atsc/src/lib/GrAtscInterleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscInterleaver.h>
diff --git a/gr-atsc/src/lib/GrAtscInterleaver.h b/gr-atsc/src/lib/GrAtscInterleaver.h
index 26bf64369c..556dfa31f8 100644
--- a/gr-atsc/src/lib/GrAtscInterleaver.h
+++ b/gr-atsc/src/lib/GrAtscInterleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCINTERLEAVER_H_
diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.cc b/gr-atsc/src/lib/GrAtscRSDecoder.cc
index 58a6929751..d9fb7422d7 100644
--- a/gr-atsc/src/lib/GrAtscRSDecoder.cc
+++ b/gr-atsc/src/lib/GrAtscRSDecoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscRSDecoder.h>
diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.h b/gr-atsc/src/lib/GrAtscRSDecoder.h
index 78bc96d08a..bd1ef455e9 100644
--- a/gr-atsc/src/lib/GrAtscRSDecoder.h
+++ b/gr-atsc/src/lib/GrAtscRSDecoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCRSDECODER_H_
diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.cc b/gr-atsc/src/lib/GrAtscRSEncoder.cc
index 7b2a7af5a6..c76bc2fd75 100644
--- a/gr-atsc/src/lib/GrAtscRSEncoder.cc
+++ b/gr-atsc/src/lib/GrAtscRSEncoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscRSEncoder.h>
diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.h b/gr-atsc/src/lib/GrAtscRSEncoder.h
index f14267d1c4..502f7fe774 100644
--- a/gr-atsc/src/lib/GrAtscRSEncoder.h
+++ b/gr-atsc/src/lib/GrAtscRSEncoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCRSENCODER_H_
diff --git a/gr-atsc/src/lib/GrAtscRandomizer.cc b/gr-atsc/src/lib/GrAtscRandomizer.cc
index d2a14de495..3abf0a0bb6 100644
--- a/gr-atsc/src/lib/GrAtscRandomizer.cc
+++ b/gr-atsc/src/lib/GrAtscRandomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscRandomizer.h>
diff --git a/gr-atsc/src/lib/GrAtscRandomizer.h b/gr-atsc/src/lib/GrAtscRandomizer.h
index 39c1b65006..8b7d576325 100644
--- a/gr-atsc/src/lib/GrAtscRandomizer.h
+++ b/gr-atsc/src/lib/GrAtscRandomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCRANDOMIZER_H_
diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.cc b/gr-atsc/src/lib/GrAtscSegSymSync.cc
index ad2384b8d5..5596596e45 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSync.cc
+++ b/gr-atsc/src/lib/GrAtscSegSymSync.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscSegSymSync.h>
diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.h b/gr-atsc/src/lib/GrAtscSegSymSync.h
index 1e32e1698b..9b5249dec8 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSync.h
+++ b/gr-atsc/src/lib/GrAtscSegSymSync.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCSEGSYMSYNC_H_
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc
index ce27eb3580..4d9ec964f5 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc
+++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscSegSymSyncImpl.h>
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h
index d0387408c1..d2ece9d869 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h
+++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCSEGSYMSYNCIMPL_H_
#define _GRATSCSEGSYMSYNCIMPL_H_
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h b/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h
index b58dceef89..f0d26ae0af 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h
+++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
class GrAtscSegSymSync;
diff --git a/gr-atsc/src/lib/GrAtscSymbolMapper.h b/gr-atsc/src/lib/GrAtscSymbolMapper.h
index 061f4aa724..509c5a2ab7 100644
--- a/gr-atsc/src/lib/GrAtscSymbolMapper.h
+++ b/gr-atsc/src/lib/GrAtscSymbolMapper.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCSYMBOLMAPPER_H_
diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc b/gr-atsc/src/lib/GrAtscTrellisEncoder.cc
index 8c55e1459d..2babaeac49 100644
--- a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc
+++ b/gr-atsc/src/lib/GrAtscTrellisEncoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscTrellisEncoder.h>
diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.h b/gr-atsc/src/lib/GrAtscTrellisEncoder.h
index ac17de35c8..0148e39c65 100644
--- a/gr-atsc/src/lib/GrAtscTrellisEncoder.h
+++ b/gr-atsc/src/lib/GrAtscTrellisEncoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCTRELLISENCODER_H_
diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc b/gr-atsc/src/lib/GrAtscViterbiDecoder.cc
index 2b7174b8e1..caf15483ed 100644
--- a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc
+++ b/gr-atsc/src/lib/GrAtscViterbiDecoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <GrAtscViterbiDecoder.h>
diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.h b/gr-atsc/src/lib/GrAtscViterbiDecoder.h
index 10e3480618..fb4b84b61f 100644
--- a/gr-atsc/src/lib/GrAtscViterbiDecoder.h
+++ b/gr-atsc/src/lib/GrAtscViterbiDecoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GRATSCVITERBIDECODER_H_
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index b728538751..4dba8f9a8c 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
include $(top_srcdir)/Makefile.common
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
index 432ad4c533..e59c326d83 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc
+++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.h b/gr-atsc/src/lib/atsc_bit_timing_loop.h
index 582092763a..f39479ebb8 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.h
+++ b/gr-atsc/src/lib/atsc_bit_timing_loop.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_BIT_TIMING_LOOP_H
#define INCLUDED_ATSC_BIT_TIMING_LOOP_H
diff --git a/gr-atsc/src/lib/atsc_consts.h b/gr-atsc/src/lib/atsc_consts.h
index 197ec57b6e..cf183ebad9 100644
--- a/gr-atsc/src/lib/atsc_consts.h
+++ b/gr-atsc/src/lib/atsc_consts.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_CONSTS_H_
diff --git a/gr-atsc/src/lib/atsc_deinterleaver.cc b/gr-atsc/src/lib/atsc_deinterleaver.cc
index f698726ce3..87a951dc6f 100644
--- a/gr-atsc/src/lib/atsc_deinterleaver.cc
+++ b/gr-atsc/src/lib/atsc_deinterleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_deinterleaver.h b/gr-atsc/src/lib/atsc_deinterleaver.h
index 17527b5e4f..571715fca9 100644
--- a/gr-atsc/src/lib/atsc_deinterleaver.h
+++ b/gr-atsc/src/lib/atsc_deinterleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_DEINTERLEAVER_H
#define INCLUDED_ATSC_DEINTERLEAVER_H
diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc
index e63eebc3ae..5d8dc4c0a9 100644
--- a/gr-atsc/src/lib/atsc_depad.cc
+++ b/gr-atsc/src/lib/atsc_depad.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_depad.h b/gr-atsc/src/lib/atsc_depad.h
index 3db933b57d..9c31e780db 100644
--- a/gr-atsc/src/lib/atsc_depad.h
+++ b/gr-atsc/src/lib/atsc_depad.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_DEPAD_H
#define INCLUDED_ATSC_DEPAD_H
diff --git a/gr-atsc/src/lib/atsc_derandomizer.cc b/gr-atsc/src/lib/atsc_derandomizer.cc
index 2a411271a7..ca35bfa422 100644
--- a/gr-atsc/src/lib/atsc_derandomizer.cc
+++ b/gr-atsc/src/lib/atsc_derandomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_derandomizer.h b/gr-atsc/src/lib/atsc_derandomizer.h
index 97cb3a2f02..0a45d8a16a 100644
--- a/gr-atsc/src/lib/atsc_derandomizer.h
+++ b/gr-atsc/src/lib/atsc_derandomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_DERANDOMIZER_H
#define INCLUDED_ATSC_DERANDOMIZER_H
diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.cc b/gr-atsc/src/lib/atsc_ds_to_softds.cc
index 682cea0276..898087514e 100644
--- a/gr-atsc/src/lib/atsc_ds_to_softds.cc
+++ b/gr-atsc/src/lib/atsc_ds_to_softds.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.h b/gr-atsc/src/lib/atsc_ds_to_softds.h
index 837da7dbb9..ca49d184b5 100644
--- a/gr-atsc/src/lib/atsc_ds_to_softds.h
+++ b/gr-atsc/src/lib/atsc_ds_to_softds.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_DS_TO_SOFTDS_H
#define INCLUDED_ATSC_DS_TO_SOFTDS_H
diff --git a/gr-atsc/src/lib/atsc_equalizer.cc b/gr-atsc/src/lib/atsc_equalizer.cc
index 168d62209f..f5ad6d0d8f 100644
--- a/gr-atsc/src/lib/atsc_equalizer.cc
+++ b/gr-atsc/src/lib/atsc_equalizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_equalizer.h b/gr-atsc/src/lib/atsc_equalizer.h
index a8f448d7e2..769902bff8 100644
--- a/gr-atsc/src/lib/atsc_equalizer.h
+++ b/gr-atsc/src/lib/atsc_equalizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_EQUALIZER_H
#define INCLUDED_ATSC_EQUALIZER_H
diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc
index d30947d552..1534da8ada 100644
--- a/gr-atsc/src/lib/atsc_field_sync_demux.cc
+++ b/gr-atsc/src/lib/atsc_field_sync_demux.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.h b/gr-atsc/src/lib/atsc_field_sync_demux.h
index 7ce64b5242..05ef068c95 100644
--- a/gr-atsc/src/lib/atsc_field_sync_demux.h
+++ b/gr-atsc/src/lib/atsc_field_sync_demux.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
#define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/src/lib/atsc_field_sync_mux.cc
index edaa241489..1f0ecf92a6 100644
--- a/gr-atsc/src/lib/atsc_field_sync_mux.cc
+++ b/gr-atsc/src/lib/atsc_field_sync_mux.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.h b/gr-atsc/src/lib/atsc_field_sync_mux.h
index 91000e169c..7a12d3fd05 100644
--- a/gr-atsc/src/lib/atsc_field_sync_mux.h
+++ b/gr-atsc/src/lib/atsc_field_sync_mux.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_FIELD_SYNC_MUX_H
#define INCLUDED_ATSC_FIELD_SYNC_MUX_H
diff --git a/gr-atsc/src/lib/atsc_fpll.cc b/gr-atsc/src/lib/atsc_fpll.cc
index 087a8080a8..bbe0cae458 100644
--- a/gr-atsc/src/lib/atsc_fpll.cc
+++ b/gr-atsc/src/lib/atsc_fpll.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h
index b6213bac77..ae00c051fd 100644
--- a/gr-atsc/src/lib/atsc_fpll.h
+++ b/gr-atsc/src/lib/atsc_fpll.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_FPLL_H
#define INCLUDED_ATSC_FPLL_H
diff --git a/gr-atsc/src/lib/atsc_fs_checker.cc b/gr-atsc/src/lib/atsc_fs_checker.cc
index 10d8353e86..af76f1a83f 100644
--- a/gr-atsc/src/lib/atsc_fs_checker.cc
+++ b/gr-atsc/src/lib/atsc_fs_checker.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_fs_checker.h b/gr-atsc/src/lib/atsc_fs_checker.h
index a844cd3b23..3fc31373ef 100644
--- a/gr-atsc/src/lib/atsc_fs_checker.h
+++ b/gr-atsc/src/lib/atsc_fs_checker.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_FS_CHECKER_H
#define INCLUDED_ATSC_FS_CHECKER_H
diff --git a/gr-atsc/src/lib/atsc_interleaver.cc b/gr-atsc/src/lib/atsc_interleaver.cc
index 567c1b4613..62cf2d89ea 100644
--- a/gr-atsc/src/lib/atsc_interleaver.cc
+++ b/gr-atsc/src/lib/atsc_interleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_interleaver.h b/gr-atsc/src/lib/atsc_interleaver.h
index 18fd8e541e..2ab46db67f 100644
--- a/gr-atsc/src/lib/atsc_interleaver.h
+++ b/gr-atsc/src/lib/atsc_interleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_INTERLEAVER_H
#define INCLUDED_ATSC_INTERLEAVER_H
diff --git a/gr-atsc/src/lib/atsc_randomizer.cc b/gr-atsc/src/lib/atsc_randomizer.cc
index 7b9fed0eb8..ba9da72119 100644
--- a/gr-atsc/src/lib/atsc_randomizer.cc
+++ b/gr-atsc/src/lib/atsc_randomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_randomizer.h b/gr-atsc/src/lib/atsc_randomizer.h
index 31f20c83d2..f11e177846 100644
--- a/gr-atsc/src/lib/atsc_randomizer.h
+++ b/gr-atsc/src/lib/atsc_randomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_RANDOMIZER_H
#define INCLUDED_ATSC_RANDOMIZER_H
diff --git a/gr-atsc/src/lib/atsc_rs_decoder.cc b/gr-atsc/src/lib/atsc_rs_decoder.cc
index 7885cca425..6466bac6c0 100644
--- a/gr-atsc/src/lib/atsc_rs_decoder.cc
+++ b/gr-atsc/src/lib/atsc_rs_decoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_rs_decoder.h b/gr-atsc/src/lib/atsc_rs_decoder.h
index 7c10a3db74..401d689e16 100644
--- a/gr-atsc/src/lib/atsc_rs_decoder.h
+++ b/gr-atsc/src/lib/atsc_rs_decoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_RS_DECODER_H
#define INCLUDED_ATSC_RS_DECODER_H
diff --git a/gr-atsc/src/lib/atsc_rs_encoder.cc b/gr-atsc/src/lib/atsc_rs_encoder.cc
index 53f45d59a8..5f92a3c03a 100644
--- a/gr-atsc/src/lib/atsc_rs_encoder.cc
+++ b/gr-atsc/src/lib/atsc_rs_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_rs_encoder.h b/gr-atsc/src/lib/atsc_rs_encoder.h
index da1fd63eaf..034bbc7fc5 100644
--- a/gr-atsc/src/lib/atsc_rs_encoder.h
+++ b/gr-atsc/src/lib/atsc_rs_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_RS_ENCODER_H
#define INCLUDED_ATSC_RS_ENCODER_H
diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.cc b/gr-atsc/src/lib/atsc_trellis_encoder.cc
index 77cf08af44..dc145605b2 100644
--- a/gr-atsc/src/lib/atsc_trellis_encoder.cc
+++ b/gr-atsc/src/lib/atsc_trellis_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.h b/gr-atsc/src/lib/atsc_trellis_encoder.h
index 98b549ef8e..2ab2200a16 100644
--- a/gr-atsc/src/lib/atsc_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsc_trellis_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_TRELLIS_ENCODER_H
#define INCLUDED_ATSC_TRELLIS_ENCODER_H
diff --git a/gr-atsc/src/lib/atsc_types.h b/gr-atsc/src/lib/atsc_types.h
index 1a7708ec3d..5c2ab64faf 100644
--- a/gr-atsc/src/lib/atsc_types.h
+++ b/gr-atsc/src/lib/atsc_types.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_TYPES_H_
diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.cc b/gr-atsc/src/lib/atsc_viterbi_decoder.cc
index 394ee5035f..180e035330 100644
--- a/gr-atsc/src/lib/atsc_viterbi_decoder.cc
+++ b/gr-atsc/src/lib/atsc_viterbi_decoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.h b/gr-atsc/src/lib/atsc_viterbi_decoder.h
index 931397eda3..17a47d98a3 100644
--- a/gr-atsc/src/lib/atsc_viterbi_decoder.h
+++ b/gr-atsc/src/lib/atsc_viterbi_decoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_ATSC_VITERBI_DECODER_H
#define INCLUDED_ATSC_VITERBI_DECODER_H
diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc b/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc
index 35081eb8e0..181eba02e8 100644
--- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc
+++ b/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_basic_trellis_encoder.h>
diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
index 34c45e4711..906e273c1d 100644
--- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_BASIC_TRELLIS_ENCODER_H_
#define _ATSC_BASIC_TRELLIS_ENCODER_H_
diff --git a/gr-atsc/src/lib/atsci_data_interleaver.cc b/gr-atsc/src/lib/atsci_data_interleaver.cc
index 4826df79db..7eb300d8ac 100644
--- a/gr-atsc/src/lib/atsci_data_interleaver.cc
+++ b/gr-atsc/src/lib/atsci_data_interleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_data_interleaver.h>
diff --git a/gr-atsc/src/lib/atsci_data_interleaver.h b/gr-atsc/src/lib/atsci_data_interleaver.h
index 26286b5b85..6fd02f5f07 100644
--- a/gr-atsc/src/lib/atsci_data_interleaver.h
+++ b/gr-atsc/src/lib/atsci_data_interleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_DATA_INTERLEAVER_H_
diff --git a/gr-atsc/src/lib/atsci_diag_output.h b/gr-atsc/src/lib/atsci_diag_output.h
index 163a6f0aa4..4e588d9683 100644
--- a/gr-atsc/src/lib/atsci_diag_output.h
+++ b/gr-atsc/src/lib/atsci_diag_output.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
/*
diff --git a/gr-atsc/src/lib/atsci_equalizer.cc b/gr-atsc/src/lib/atsci_equalizer.cc
index 29c248cf32..8f540b01fc 100644
--- a/gr-atsc/src/lib/atsci_equalizer.cc
+++ b/gr-atsc/src/lib/atsci_equalizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_equalizer.h>
diff --git a/gr-atsc/src/lib/atsci_equalizer.h b/gr-atsc/src/lib/atsci_equalizer.h
index 53bc9b6a73..18134ecb24 100644
--- a/gr-atsc/src/lib/atsci_equalizer.h
+++ b/gr-atsc/src/lib/atsci_equalizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_EQUALIZER_H_
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.cc b/gr-atsc/src/lib/atsci_equalizer_lms.cc
index 2fc084b36a..5e9bc41144 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_equalizer_lms.h>
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.h b/gr-atsc/src/lib/atsci_equalizer_lms.h
index 8303647c35..3fc721a005 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms.h
+++ b/gr-atsc/src/lib/atsci_equalizer_lms.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_EQUALIZER_LMS_H_
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
index d461d60864..ad585fe9b7 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_equalizer_lms2.h>
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.h b/gr-atsc/src/lib/atsci_equalizer_lms2.h
index 60ac8944de..1ac270fe28 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.h
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_EQUALIZER_LMS2_H_
diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.cc b/gr-atsc/src/lib/atsci_equalizer_nop.cc
index 681a6b24b7..a7e0543234 100644
--- a/gr-atsc/src/lib/atsci_equalizer_nop.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_nop.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_equalizer_nop.h>
diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.h b/gr-atsc/src/lib/atsci_equalizer_nop.h
index b5f5b0cc4a..0d26d4e009 100644
--- a/gr-atsc/src/lib/atsci_equalizer_nop.h
+++ b/gr-atsc/src/lib/atsci_equalizer_nop.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_EQUALIZER_NOP_H_
diff --git a/gr-atsc/src/lib/atsci_exp2_lp.cc b/gr-atsc/src/lib/atsci_exp2_lp.cc
index 9c7216db88..abc9e4eb33 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp.cc
+++ b/gr-atsc/src/lib/atsci_exp2_lp.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsc_consts.h>
diff --git a/gr-atsc/src/lib/atsci_exp2_lp.h b/gr-atsc/src/lib/atsci_exp2_lp.h
index 5370e40ba4..ea627f194d 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp.h
+++ b/gr-atsc/src/lib/atsci_exp2_lp.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_EXP2_LP_H_
diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/atsci_fake_single_viterbi.cc
index 365350cc8e..6895d93c31 100644
--- a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc
+++ b/gr-atsc/src/lib/atsci_fake_single_viterbi.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <math.h>
diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.h b/gr-atsc/src/lib/atsci_fake_single_viterbi.h
index 19f67740b3..4e61f499b4 100644
--- a/gr-atsc/src/lib/atsci_fake_single_viterbi.h
+++ b/gr-atsc/src/lib/atsci_fake_single_viterbi.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSCFAKESINGLEVITERBI_H_
diff --git a/gr-atsc/src/lib/atsci_fs_checker.cc b/gr-atsc/src/lib/atsci_fs_checker.cc
index 52b20f84f3..9ed4620cce 100644
--- a/gr-atsc/src/lib/atsci_fs_checker.cc
+++ b/gr-atsc/src/lib/atsci_fs_checker.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_fs_checker.h>
diff --git a/gr-atsc/src/lib/atsci_fs_checker.h b/gr-atsc/src/lib/atsci_fs_checker.h
index 66e650768e..3a18fb0ddc 100644
--- a/gr-atsc/src/lib/atsci_fs_checker.h
+++ b/gr-atsc/src/lib/atsci_fs_checker.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_FS_CHECKER_H_
#define _ATSC_FS_CHECKER_H_
diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.cc b/gr-atsc/src/lib/atsci_fs_checker_naive.cc
index aac4c821af..dad3dd5684 100644
--- a/gr-atsc/src/lib/atsci_fs_checker_naive.cc
+++ b/gr-atsc/src/lib/atsci_fs_checker_naive.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_fs_checker_naive.h>
diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.h b/gr-atsc/src/lib/atsci_fs_checker_naive.h
index b86ab18117..e6411c0b06 100644
--- a/gr-atsc/src/lib/atsci_fs_checker_naive.h
+++ b/gr-atsc/src/lib/atsci_fs_checker_naive.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_FS_CHECKER_NAIVE_H_
diff --git a/gr-atsc/src/lib/atsci_fs_correlator.cc b/gr-atsc/src/lib/atsci_fs_correlator.cc
index 29cf2920c1..2775fe496a 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator.cc
+++ b/gr-atsc/src/lib/atsci_fs_correlator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_fs_correlator.h>
diff --git a/gr-atsc/src/lib/atsci_fs_correlator.h b/gr-atsc/src/lib/atsci_fs_correlator.h
index 80622d9a5d..03b942d7a6 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator.h
+++ b/gr-atsc/src/lib/atsci_fs_correlator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_FS_CORRELATOR_H_
#define _ATSC_FS_CORRELATOR_H_
diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc b/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
index 7c4946bb72..161fdd2020 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
+++ b/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_fs_correlator_naive.h>
diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.h b/gr-atsc/src/lib/atsci_fs_correlator_naive.h
index 7f9b56271e..0252ec2d34 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator_naive.h
+++ b/gr-atsc/src/lib/atsci_fs_correlator_naive.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_FS_CORRELATOR_NAIVE_H_
diff --git a/gr-atsc/src/lib/atsci_pnXXX.cc b/gr-atsc/src/lib/atsci_pnXXX.cc
index efa61e005e..22df8fd971 100644
--- a/gr-atsc/src/lib/atsci_pnXXX.cc
+++ b/gr-atsc/src/lib/atsci_pnXXX.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_pnXXX.h>
diff --git a/gr-atsc/src/lib/atsci_pnXXX.h b/gr-atsc/src/lib/atsci_pnXXX.h
index 1cb9b1b856..8894878ece 100644
--- a/gr-atsc/src/lib/atsci_pnXXX.h
+++ b/gr-atsc/src/lib/atsci_pnXXX.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
extern const unsigned char atsc_pn511[];
diff --git a/gr-atsc/src/lib/atsci_randomizer.cc b/gr-atsc/src/lib/atsci_randomizer.cc
index 5cdcaa8933..b530f85511 100644
--- a/gr-atsc/src/lib/atsci_randomizer.cc
+++ b/gr-atsc/src/lib/atsci_randomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_randomizer.h>
diff --git a/gr-atsc/src/lib/atsci_randomizer.h b/gr-atsc/src/lib/atsci_randomizer.h
index c9f3b66e5d..64888093b5 100644
--- a/gr-atsc/src/lib/atsci_randomizer.h
+++ b/gr-atsc/src/lib/atsci_randomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_RANDOMIZER_H_
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/src/lib/atsci_reed_solomon.cc
index 26265d3518..e7704bac5e 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.cc
+++ b/gr-atsc/src/lib/atsci_reed_solomon.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_reed_solomon.h>
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.h b/gr-atsc/src/lib/atsci_reed_solomon.h
index 882741f0b1..4310e1e11b 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.h
+++ b/gr-atsc/src/lib/atsci_reed_solomon.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_REED_SOLOMON_H_
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.cc b/gr-atsc/src/lib/atsci_root_raised_cosine.cc
index 00912ad538..fe91b055f8 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.cc
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsc_consts.h>
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.h b/gr-atsc/src/lib/atsci_root_raised_cosine.h
index c3f0a9eae2..8bb51b8cd2 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.h
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_RRC_H_
#define _ATSC_RRC_H_
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc
index fbdc4caa51..2f3dfcfa8e 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_root_raised_cosine_bandpass.h>
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
index 5de2475fa6..609f7d1723 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_RRC_BANDPASS_H_
#define _ATSC_RRC_BANDPASS_H_
diff --git a/gr-atsc/src/lib/atsci_single_viterbi.cc b/gr-atsc/src/lib/atsci_single_viterbi.cc
index edc2cd13be..788b961831 100644
--- a/gr-atsc/src/lib/atsci_single_viterbi.cc
+++ b/gr-atsc/src/lib/atsci_single_viterbi.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <math.h>
diff --git a/gr-atsc/src/lib/atsci_single_viterbi.h b/gr-atsc/src/lib/atsci_single_viterbi.h
index 907b41c901..3f903a2a76 100644
--- a/gr-atsc/src/lib/atsci_single_viterbi.h
+++ b/gr-atsc/src/lib/atsci_single_viterbi.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSCSINGLEVITERBI_H_
diff --git a/gr-atsc/src/lib/atsci_slicer_agc.h b/gr-atsc/src/lib/atsci_slicer_agc.h
index f1244bd01a..543f16acce 100644
--- a/gr-atsc/src/lib/atsci_slicer_agc.h
+++ b/gr-atsc/src/lib/atsci_slicer_agc.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_SLICER_AGC_H_
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.cc b/gr-atsc/src/lib/atsci_sliding_correlator.cc
index dc821db51c..af0f034348 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.cc
+++ b/gr-atsc/src/lib/atsci_sliding_correlator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_sliding_correlator.h>
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/src/lib/atsci_sliding_correlator.h
index 9bb14db9d7..1cc85e5cec 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.h
+++ b/gr-atsc/src/lib/atsci_sliding_correlator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_SLIDING_CORRELATOR_H_
#define _ATSC_SLIDING_CORRELATOR_H_
diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc
index 7790c656c3..b52f7a66bd 100644
--- a/gr-atsc/src/lib/atsci_sssr.cc
+++ b/gr-atsc/src/lib/atsci_sssr.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_sssr.h>
diff --git a/gr-atsc/src/lib/atsci_sssr.h b/gr-atsc/src/lib/atsci_sssr.h
index 0d575cd88b..a6ec8109b0 100644
--- a/gr-atsc/src/lib/atsci_sssr.h
+++ b/gr-atsc/src/lib/atsci_sssr.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
/*
diff --git a/gr-atsc/src/lib/atsci_syminfo.h b/gr-atsc/src/lib/atsci_syminfo.h
index 8d421181e4..527ebde16d 100644
--- a/gr-atsc/src/lib/atsci_syminfo.h
+++ b/gr-atsc/src/lib/atsci_syminfo.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_SYMINFO_H_
#define _ATSC_SYMINFO_H_
diff --git a/gr-atsc/src/lib/atsci_sync_tag.h b/gr-atsc/src/lib/atsci_sync_tag.h
index bca8b86465..f10a4f3735 100644
--- a/gr-atsc/src/lib/atsci_sync_tag.h
+++ b/gr-atsc/src/lib/atsci_sync_tag.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_SYNC_TAG_H_
#define _ATSC_SYNC_TAG_H_
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.cc b/gr-atsc/src/lib/atsci_trellis_encoder.cc
index 8e09739f2e..5d0a3fc1da 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.cc
+++ b/gr-atsc/src/lib/atsci_trellis_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_trellis_encoder.h>
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.h b/gr-atsc/src/lib/atsci_trellis_encoder.h
index 429d3d1057..fbe6a02b00 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsci_trellis_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_TRELLIS_ENCODER_H_
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.cc b/gr-atsc/src/lib/atsci_viterbi_decoder.cc
index 4e017a98b6..04b9e5f4b9 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.cc
+++ b/gr-atsc/src/lib/atsci_viterbi_decoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsci_viterbi_decoder.h>
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.h b/gr-atsc/src/lib/atsci_viterbi_decoder.h
index a804b666c6..0b81273b12 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.h
+++ b/gr-atsc/src/lib/atsci_viterbi_decoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_VITERBI_DECODER_H_
diff --git a/gr-atsc/src/lib/atsci_viterbi_gen.cc b/gr-atsc/src/lib/atsci_viterbi_gen.cc
index 2004dbbcbc..d8a35f4940 100644
--- a/gr-atsc/src/lib/atsci_viterbi_gen.cc
+++ b/gr-atsc/src/lib/atsci_viterbi_gen.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <iostream>
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.cc b/gr-atsc/src/lib/atsci_vsbtx_lp.cc
index d0878dcc3f..c3b597c244 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.cc
+++ b/gr-atsc/src/lib/atsci_vsbtx_lp.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsc_consts.h>
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.h b/gr-atsc/src/lib/atsci_vsbtx_lp.h
index 112a4bb4a6..536fb3bb8e 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.h
+++ b/gr-atsc/src/lib/atsci_vsbtx_lp.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _ATSC_VSBTX_LP_H_
diff --git a/gr-atsc/src/lib/convolutional_interleaver.h b/gr-atsc/src/lib/convolutional_interleaver.h
index bb33625214..3d46a0d7d0 100644
--- a/gr-atsc/src/lib/convolutional_interleaver.h
+++ b/gr-atsc/src/lib/convolutional_interleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _CONVOLUTIONAL_INTERLEAVER_H_
diff --git a/gr-atsc/src/lib/create_atsci_equalizer.cc b/gr-atsc/src/lib/create_atsci_equalizer.cc
index 0f3bdbcb0a..7ad663640e 100644
--- a/gr-atsc/src/lib/create_atsci_equalizer.cc
+++ b/gr-atsc/src/lib/create_atsci_equalizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <create_atsci_equalizer.h>
diff --git a/gr-atsc/src/lib/create_atsci_equalizer.h b/gr-atsc/src/lib/create_atsci_equalizer.h
index 5e1023de92..075759566c 100644
--- a/gr-atsc/src/lib/create_atsci_equalizer.h
+++ b/gr-atsc/src/lib/create_atsci_equalizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _CREATE_ATSC_EQUALIZER_H_
#define _CREATE_ATSC_EQUALIZER_H_
diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.cc b/gr-atsc/src/lib/create_atsci_fs_checker.cc
index a0a0f3d1c4..72195fb1c1 100644
--- a/gr-atsc/src/lib/create_atsci_fs_checker.cc
+++ b/gr-atsc/src/lib/create_atsci_fs_checker.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <create_atsci_fs_checker.h>
diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.h b/gr-atsc/src/lib/create_atsci_fs_checker.h
index 6b258bcf77..ef44650944 100644
--- a/gr-atsc/src/lib/create_atsci_fs_checker.h
+++ b/gr-atsc/src/lib/create_atsci_fs_checker.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _CREATE_ATSC_FS_CHECKER_H_
diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.cc b/gr-atsc/src/lib/create_atsci_fs_correlator.cc
index 6664003e2f..33f2f97a00 100644
--- a/gr-atsc/src/lib/create_atsci_fs_correlator.cc
+++ b/gr-atsc/src/lib/create_atsci_fs_correlator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <create_atsci_fs_correlator.h>
diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.h b/gr-atsc/src/lib/create_atsci_fs_correlator.h
index 511bce996f..7515bdff1c 100644
--- a/gr-atsc/src/lib/create_atsci_fs_correlator.h
+++ b/gr-atsc/src/lib/create_atsci_fs_correlator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _CREATE_ATSC_FS_CORRELATOR_H_
diff --git a/gr-atsc/src/lib/fpll_btloop_coupling.h b/gr-atsc/src/lib/fpll_btloop_coupling.h
index f5c90f9491..37e14693aa 100644
--- a/gr-atsc/src/lib/fpll_btloop_coupling.h
+++ b/gr-atsc/src/lib/fpll_btloop_coupling.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _FPLL_BTLOOP_COUPLING_H_
#define _FPLL_BTLOOP_COUPLING_H_
diff --git a/gr-atsc/src/lib/gen_encoder.py b/gr-atsc/src/lib/gen_encoder.py
index 0a2a50801c..420fea3d76 100755
--- a/gr-atsc/src/lib/gen_encoder.py
+++ b/gr-atsc/src/lib/gen_encoder.py
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
def output(input, state):
diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/src/lib/interleaver_fifo.h
index e20b968ff3..191cb408e1 100644
--- a/gr-atsc/src/lib/interleaver_fifo.h
+++ b/gr-atsc/src/lib/interleaver_fifo.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _INTERLEAVER_FIFO_H_
diff --git a/gr-atsc/src/lib/plinfo.cc b/gr-atsc/src/lib/plinfo.cc
index b28a13d59d..fedfdb9157 100644
--- a/gr-atsc/src/lib/plinfo.cc
+++ b/gr-atsc/src/lib/plinfo.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <atsc_types.h>
diff --git a/gr-atsc/src/lib/qa_atsci.cc b/gr-atsc/src/lib/qa_atsci.cc
index bc7fba3a1d..644a7e7280 100644
--- a/gr-atsc/src/lib/qa_atsci.cc
+++ b/gr-atsc/src/lib/qa_atsci.cc
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
/*
diff --git a/gr-atsc/src/lib/qa_atsci.h b/gr-atsc/src/lib/qa_atsci.h
index cf861a8be4..191ca77181 100644
--- a/gr-atsc/src/lib/qa_atsci.h
+++ b/gr-atsc/src/lib/qa_atsci.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_H_
diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc
index c6212f30d6..d8532cb2bc 100644
--- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc
+++ b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h
index 5d76f5ea0f..eca01c0675 100644
--- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h
+++ b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_BASIC_TRELLIS_ENCODER_H_
#define _QA_ATSC_BASIC_TRELLIS_ENCODER_H_
diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
index c09d1231ce..16242c9fa1 100644
--- a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
+++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cppunit/TestAssert.h>
diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.h b/gr-atsc/src/lib/qa_atsci_data_interleaver.h
index 9d72f1a991..e4e4b86c94 100644
--- a/gr-atsc/src/lib/qa_atsci_data_interleaver.h
+++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_DATA_INTERLEAVER_H_
diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
index a12f2536cc..18f0536be1 100644
--- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
+++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <qa_atsci_equalizer_nop.h>
diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h b/gr-atsc/src/lib/qa_atsci_equalizer_nop.h
index cfe8920eac..ca062cd27f 100644
--- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h
+++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_EQUALIZER_NOP_H_
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
index f0ff635609..a6e9468b44 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h
index 2161d5d99e..73d3fa8f3a 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h
+++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_FAKE_SINGLE_VITERBI_H
diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc b/gr-atsc/src/lib/qa_atsci_fs_correlator.cc
index 97d45f5c1a..e0fce31e2e 100644
--- a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc
+++ b/gr-atsc/src/lib/qa_atsci_fs_correlator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.h b/gr-atsc/src/lib/qa_atsci_fs_correlator.h
index a38a5e201f..14f931ced3 100644
--- a/gr-atsc/src/lib/qa_atsci_fs_correlator.h
+++ b/gr-atsc/src/lib/qa_atsci_fs_correlator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_FS_CORRELATOR_H_
#define _QA_ATSC_FS_CORRELATOR_H_
diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.cc b/gr-atsc/src/lib/qa_atsci_randomizer.cc
index 46b228f0ff..e16a3840d8 100644
--- a/gr-atsc/src/lib/qa_atsci_randomizer.cc
+++ b/gr-atsc/src/lib/qa_atsci_randomizer.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <qa_atsci_randomizer.h>
diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.h b/gr-atsc/src/lib/qa_atsci_randomizer.h
index 5a805df8a1..8f891e42f3 100644
--- a/gr-atsc/src/lib/qa_atsci_randomizer.h
+++ b/gr-atsc/src/lib/qa_atsci_randomizer.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_RANDOMIZER_H_
#define _QA_ATSC_RANDOMIZER_H_
diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
index 8b52359e2a..2266bbed15 100644
--- a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
+++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.h b/gr-atsc/src/lib/qa_atsci_reed_solomon.h
index d78aa74748..e4708dfc1e 100644
--- a/gr-atsc/src/lib/qa_atsci_reed_solomon.h
+++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_REED_SOLOMON_H_
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
index ea94e69398..853bba718e 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.h b/gr-atsc/src/lib/qa_atsci_single_viterbi.h
index 0c0a3349ae..b220eb866f 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.h
+++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_SINGLE_VITERBI_H
diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc b/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc
index e315847177..b48a328e9e 100644
--- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc
+++ b/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cppunit/TestAssert.h>
diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h b/gr-atsc/src/lib/qa_atsci_sliding_correlator.h
index 508020c25e..931d7124a9 100644
--- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h
+++ b/gr-atsc/src/lib/qa_atsci_sliding_correlator.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_SLIDING_CORRELATOR_H_
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
index 193f2b3108..827c2df229 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
+++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h b/gr-atsc/src/lib/qa_atsci_trellis_encoder.h
index 40657169ae..2135e7c66e 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h
+++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_TRELLIS_ENCODER_H_
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
index 5cc329787f..1816ce8bb2 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
+++ b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h
index 78b57de980..11950c9518 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h
+++ b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_ATSC_VITERBI_DECODER_H_
diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.cc b/gr-atsc/src/lib/qa_convolutional_interleaver.cc
index 2850549b00..69640b4057 100644
--- a/gr-atsc/src/lib/qa_convolutional_interleaver.cc
+++ b/gr-atsc/src/lib/qa_convolutional_interleaver.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cppunit/TestAssert.h>
diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.h b/gr-atsc/src/lib/qa_convolutional_interleaver.h
index 54f3b1e1af..08b4bbd942 100644
--- a/gr-atsc/src/lib/qa_convolutional_interleaver.h
+++ b/gr-atsc/src/lib/qa_convolutional_interleaver.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_CONVOLUTIONAL_INTERLEAVER_H_
diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.cc b/gr-atsc/src/lib/qa_interleaver_fifo.cc
index 920e68bc88..3a9f4a90e0 100644
--- a/gr-atsc/src/lib/qa_interleaver_fifo.cc
+++ b/gr-atsc/src/lib/qa_interleaver_fifo.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cppunit/TestAssert.h>
diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.h b/gr-atsc/src/lib/qa_interleaver_fifo.h
index 3002e8cdf5..faf1e76cb8 100644
--- a/gr-atsc/src/lib/qa_interleaver_fifo.h
+++ b/gr-atsc/src/lib/qa_interleaver_fifo.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _QA_INTERLEAVER_FIFO_H_
diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc
index 655c3aa116..834f278b7e 100644
--- a/gr-atsc/src/lib/test_atsci.cc
+++ b/gr-atsc/src/lib/test_atsci.cc
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
*/
#include <cppunit/TextTestRunner.h>
diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index bdca325715..dfdf6f8c75 100644
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/Makefile.am
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
include $(top_srcdir)/Makefile.common
diff --git a/gr-atsc/src/python/atsc_utils.py b/gr-atsc/src/python/atsc_utils.py
index 11976640cf..2aa1639534 100644
--- a/gr-atsc/src/python/atsc_utils.py
+++ b/gr-atsc/src/python/atsc_utils.py
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
import random
diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/src/python/qa_atsc.py
index d9c94e195c..e1e815576e 100755
--- a/gr-atsc/src/python/qa_atsc.py
+++ b/gr-atsc/src/python/qa_atsc.py
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
#
from gnuradio import gr, gr_unittest