5 files changed, 19 insertions, 19 deletions
diff --git a/gnuradio-examples/c++/Makefile.am b/gnuradio-examples/c++/Makefile.am
index f25bbaa8f..4630d6933 100644
--- a/gnuradio-examples/c++/Makefile.am
+++ b/gnuradio-examples/c++/Makefile.am
@@ -22,6 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = \
-    dialtone \
+    dial_tone \
     hier
 
diff --git a/gnuradio-examples/c++/dialtone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am
index 35e807381..7bc8c504b 100644
--- a/gnuradio-examples/c++/dialtone/Makefile.am
+++ b/gnuradio-examples/c++/dial_tone/Makefile.am
@@ -32,16 +32,16 @@ GR_AUDIO_ALSA_LIBS=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
 # GNURADIO_CORE_LIBS = -lgnuradio-core
 # GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
 
-noinst_PROGRAMS = dialtone
+noinst_PROGRAMS = dial_tone
     
 noinst_HEADERS = \
-    dialtone.h
+    dial_tone.h
         
-dialtone_SOURCES = \
-    dialtone.cc	   \
+dial_tone_SOURCES = \
+    dial_tone.cc	   \
     main.cc
 
-dialtone_LDADD = \
+dial_tone_LDADD = \
     $(GNURADIO_CORE_LIBS) \
     $(GR_AUDIO_ALSA_LIBS)
 
diff --git a/gnuradio-examples/c++/dialtone/dialtone.cc b/gnuradio-examples/c++/dial_tone/dial_tone.cc
index 0debb2856..ecd46cdde 100644
--- a/gnuradio-examples/c++/dialtone/dialtone.cc
+++ b/gnuradio-examples/c++/dial_tone/dial_tone.cc
@@ -19,20 +19,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <dialtone.h>
+#include <dial_tone.h>
 #include <gr_io_signature.h>
 #include <gr_sig_source_f.h>
 #include <audio_alsa_sink.h>
 
 // Shared pointer constructor
-dialtone_sptr make_dialtone()
+dial_tone_sptr make_dial_tone()
 {
-    return dialtone_sptr(new dialtone());
+    return dial_tone_sptr(new dial_tone());
 }
 
 // Hierarchical block constructor, with no inputs or outputs
-dialtone::dialtone() : 
-gr_hier_block2("dialtone",
+dial_tone::dial_tone() : 
+gr_hier_block2("dial_tone",
 	       gr_make_io_signature(0,0,0),
 	       gr_make_io_signature(0,0,0))
 {
diff --git a/gnuradio-examples/c++/dialtone/dialtone.h b/gnuradio-examples/c++/dial_tone/dial_tone.h
index 2beb46c50..0cd27a05f 100644
--- a/gnuradio-examples/c++/dialtone/dialtone.h
+++ b/gnuradio-examples/c++/dial_tone/dial_tone.h
@@ -21,13 +21,13 @@
 
 #include <gr_hier_block2.h>
 
-class dialtone;
-typedef boost::shared_ptr<dialtone> dialtone_sptr;
-dialtone_sptr make_dialtone();
+class dial_tone;
+typedef boost::shared_ptr<dial_tone> dial_tone_sptr;
+dial_tone_sptr make_dial_tone();
 
-class dialtone : public gr_hier_block2
+class dial_tone : public gr_hier_block2
 {
 private:
-    dialtone();
-    friend dialtone_sptr make_dialtone();
+    dial_tone();
+    friend dial_tone_sptr make_dial_tone();
 };
diff --git a/gnuradio-examples/c++/dialtone/main.cc b/gnuradio-examples/c++/dial_tone/main.cc
index beefac3a5..1fcfa15ba 100644
--- a/gnuradio-examples/c++/dialtone/main.cc
+++ b/gnuradio-examples/c++/dial_tone/main.cc
@@ -25,12 +25,12 @@
 // Instantiate a runtime, passing it the top block
 // Tell the runtime to go...
 
-#include <dialtone.h>
+#include <dial_tone.h>
 #include <gr_runtime.h>
 
 int main()
 {
-    dialtone_sptr top_block = make_dialtone();
+    dial_tone_sptr top_block = make_dial_tone();
     gr_runtime_sptr runtime = gr_make_runtime(top_block);
 
     runtime->run();