diff --git a/echo2_config.cc b/echo2_config.cc
index 011a6f5bf..33c3c2811 100644
--- a/echo2_config.cc
+++ b/echo2_config.cc
@@ -25,7 +25,7 @@ class Echo2ConfigFactory : public NamedNetworkFilterConfigFactory {
     return ProtobufTypes::MessagePtr{new Envoy::ProtobufWkt::Empty()};
   }
 
-  std::string name() const override { return "echo2"; }
+  std::string name() override { return "echo2"; }
 
   bool isTerminalFilter() override { return true; }
 };
diff --git a/http-filter-example/BUILD b/http_filter_example/BUILD
similarity index 100%
rename from http-filter-example/BUILD
rename to http_filter_example/BUILD
diff --git a/http-filter-example/README.md b/http_filter_example/README.md
similarity index 100%
rename from http-filter-example/README.md
rename to http_filter_example/README.md
diff --git a/http-filter-example/http_filter.cc b/http_filter_example/http_filter.cc
similarity index 100%
rename from http-filter-example/http_filter.cc
rename to http_filter_example/http_filter.cc
diff --git a/http-filter-example/http_filter.h b/http_filter_example/http_filter.h
similarity index 96%
rename from http-filter-example/http_filter.h
rename to http_filter_example/http_filter.h
index 2a8995066..16095936b 100644
--- a/http-filter-example/http_filter.h
+++ b/http_filter_example/http_filter.h
@@ -4,7 +4,7 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "http-filter-example/http_filter.pb.h"
+#include "http_filter_example/http_filter.pb.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/http-filter-example/http_filter.proto b/http_filter_example/http_filter.proto
similarity index 100%
rename from http-filter-example/http_filter.proto
rename to http_filter_example/http_filter.proto
diff --git a/http-filter-example/http_filter_config.cc b/http_filter_example/http_filter_config.cc
similarity index 91%
rename from http-filter-example/http_filter_config.cc
rename to http_filter_example/http_filter_config.cc
index b946e96d5..43424810a 100644
--- a/http-filter-example/http_filter_config.cc
+++ b/http_filter_example/http_filter_config.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/registry/registry.h"
 
-#include "http-filter-example/http_filter.pb.h"
-#include "http-filter-example/http_filter.pb.validate.h"
+#include "http_filter_example/http_filter.pb.h"
+#include "http_filter_example/http_filter.pb.validate.h"
 #include "http_filter.h"
 
 namespace Envoy {
@@ -28,7 +28,7 @@ class HttpSampleDecoderFilterConfig : public NamedHttpFilterConfigFactory {
     return ProtobufTypes::MessagePtr{new sample::Decoder()};
   }
 
-  std::string name() const override { return "sample"; }
+  std::string name() override { return "sample"; }
 
 private:
   Http::FilterFactoryCb createFilter(const sample::Decoder& proto_config, FactoryContext&) {
diff --git a/http-filter-example/http_filter_integration_test.cc b/http_filter_example/http_filter_integration_test.cc
similarity index 100%
rename from http-filter-example/http_filter_integration_test.cc
rename to http_filter_example/http_filter_integration_test.cc