diff --git a/.gitignore b/.gitignore
index 4b9df18aa..d1676c9b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ MANIFEST
 .DS_Store
 /dist
 /build
+/cmake/
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index b6d380497..2cc8f8326 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -26,7 +26,7 @@ set(PYBIND11_EXAMPLES
   example-stl-binder-vector.cpp
   example-eval.cpp
   example-custom-exceptions.cpp
-  example20.cpp
+  example-numpy-dtypes.cpp
   issues.cpp
 )
 
diff --git a/example/example20.cpp b/example/example-numpy-dtypes.cpp
similarity index 98%
rename from example/example20.cpp
rename to example/example-numpy-dtypes.cpp
index 07849a099..2e25670f3 100644
--- a/example/example20.cpp
+++ b/example/example-numpy-dtypes.cpp
@@ -1,5 +1,5 @@
 /*
-  example/example20.cpp -- Usage of structured numpy dtypes
+  example/example-numpy-dtypes.cpp -- Structured and compound NumPy dtypes
 
   Copyright (c) 2016 Ivan Smirnov
 
@@ -169,7 +169,7 @@ void print_dtypes() {
     std::cout << to_str(py::dtype_of<StringStruct>()) << std::endl;
 }
 
-void init_ex20(py::module &m) {
+void init_ex_numpy_dtypes(py::module &m) {
     PYBIND11_NUMPY_DTYPE(SimpleStruct, x, y, z);
     PYBIND11_NUMPY_DTYPE(PackedStruct, x, y, z);
     PYBIND11_NUMPY_DTYPE(NestedStruct, a, b);
diff --git a/example/example20.py b/example/example-numpy-dtypes.py
similarity index 100%
rename from example/example20.py
rename to example/example-numpy-dtypes.py
diff --git a/example/example20.ref b/example/example-numpy-dtypes.ref
similarity index 100%
rename from example/example20.ref
rename to example/example-numpy-dtypes.ref
diff --git a/example/example.cpp b/example/example.cpp
index 819f69f44..bd6ac9b35 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -29,7 +29,7 @@ void init_ex_inheritance(py::module &);
 void init_ex_stl_binder_vector(py::module &);
 void init_ex_eval(py::module &);
 void init_ex_custom_exceptions(py::module &);
-void init_ex20(py::module &);
+void init_ex_numpy_dtypes(py::module &);
 void init_issues(py::module &);
 
 #if defined(PYBIND11_TEST_EIGEN)
@@ -73,7 +73,7 @@ PYBIND11_PLUGIN(example) {
     init_ex_stl_binder_vector(m);
     init_ex_eval(m);
     init_ex_custom_exceptions(m);
-    init_ex20(m);
+    init_ex_numpy_dtypes(m);
     init_issues(m);
 
     #if defined(PYBIND11_TEST_EIGEN)