diff --git a/doc/examples/plot_lena_bilateral_denoise.py b/doc/examples/plot_lena_bilateral_denoise.py
index 969403d0..03fc61d0 100644
--- a/doc/examples/plot_lena_bilateral_denoise.py
+++ b/doc/examples/plot_lena_bilateral_denoise.py
@@ -1,4 +1,3 @@
-
 """
 ====================================================
 Denoising the picture of Lena using bilateral filter
@@ -27,7 +26,7 @@ l = l[230:290, 220:320]
 noisy = l + 0.4 * l.std() * np.random.random(l.shape)
 
 selem = disk(30)
-bilateral_denoised = bilateral_mean(noisy.astype(np.uint8), selem=selem,s0=10,s1=10)
+approx_bilateral_denoised = bilateral_mean(noisy.astype(np.uint8), selem=selem,s0=10,s1=10)
 
 plt.figure(figsize=(8, 2))
 
@@ -36,14 +35,14 @@ plt.imshow(noisy, cmap=plt.cm.gray, vmin=40, vmax=220)
 plt.axis('off')
 plt.title('noisy', fontsize=20)
 plt.subplot(132)
-plt.imshow(bilateral_denoised, cmap=plt.cm.gray, vmin=40, vmax=220)
+plt.imshow(approx_bilateral_denoised, cmap=plt.cm.gray, vmin=40, vmax=220)
 plt.axis('off')
 plt.title('bilateral denoising', fontsize=20)
 
 selem = disk(30)
-bilateral_denoised = bilateral_mean(noisy.astype(np.uint8), selem=selem,s0=40,s1=40)
+approx_bilateral_denoised = bilateral_mean(noisy.astype(np.uint8), selem=selem,s0=40,s1=40)
 plt.subplot(133)
-plt.imshow(bilateral_denoised, cmap=plt.cm.gray, vmin=40, vmax=220)
+plt.imshow(approx_bilateral_denoised, cmap=plt.cm.gray, vmin=40, vmax=220)
 plt.axis('off')
 plt.title('(more) bilateral denoising', fontsize=20)
 
diff --git a/skimage/filter/rank/local/demo_all.py b/skimage/filter/rank/demo/demo_all.py
similarity index 100%
rename from skimage/filter/rank/local/demo_all.py
rename to skimage/filter/rank/demo/demo_all.py
diff --git a/skimage/filter/rank/local/demo_single.py b/skimage/filter/rank/demo/demo_single.py
similarity index 100%
rename from skimage/filter/rank/local/demo_single.py
rename to skimage/filter/rank/demo/demo_single.py
diff --git a/skimage/filter/rank/local/iko_pan_Ja1.tif b/skimage/filter/rank/demo/iko_pan_Ja1.tif
similarity index 100%
rename from skimage/filter/rank/local/iko_pan_Ja1.tif
rename to skimage/filter/rank/demo/iko_pan_Ja1.tif
diff --git a/skimage/filter/rank/local/test_morph_contr_enh.py b/skimage/filter/rank/demo/test_morph_contr_enh.py
similarity index 100%
rename from skimage/filter/rank/local/test_morph_contr_enh.py
rename to skimage/filter/rank/demo/test_morph_contr_enh.py
diff --git a/skimage/filter/rank/local/test_rank.py b/skimage/filter/rank/demo/test_rank.py
similarity index 100%
rename from skimage/filter/rank/local/test_rank.py
rename to skimage/filter/rank/demo/test_rank.py
diff --git a/skimage/setup.py b/skimage/setup.py
index 96497fa9..1082ba07 100644
--- a/skimage/setup.py
+++ b/skimage/setup.py
@@ -12,7 +12,6 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('draw')
     config.add_subpackage('feature')
     config.add_subpackage('filter')
-    config.add_subpackage('filter/rank')
     config.add_subpackage('graph')
     config.add_subpackage('io')
     config.add_subpackage('measure')