diff --git a/holoviews/plotting/bokeh/examples/apps/apps/crossfilter.py b/holoviews/plotting/bokeh/examples/apps/crossfilter.py
similarity index 97%
rename from holoviews/plotting/bokeh/examples/apps/apps/crossfilter.py
rename to holoviews/plotting/bokeh/examples/apps/crossfilter.py
index f9fe0ab3b0..96efaaadd6 100644
--- a/holoviews/plotting/bokeh/examples/apps/apps/crossfilter.py
+++ b/holoviews/plotting/bokeh/examples/apps/crossfilter.py
@@ -35,7 +35,6 @@
 continuous = [x for x in columns if x not in discrete]
 quantileable = [x for x in continuous if len(df[x].unique()) > 20]
 
-hv.Store.current_backend = 'bokeh'
 renderer = hv.Store.renderers['bokeh']
 options = hv.Store.options(backend='bokeh')
 options.Points = hv.Options('plot', width=800, height=600, size_index=None,)
@@ -52,7 +51,6 @@ def create_figure():
         opts['scaling_factor'] = (1./df[size.value].max())*200
     points = hv.Points(df, kdims=kdims, label=label)(plot=opts, style=style)
     plot = renderer.get_plot(points)
-    plot.initialize_plot()
     return plot.state
 
 def update(attr, old, new):
diff --git a/holoviews/plotting/bokeh/examples/apps/apps/player.py b/holoviews/plotting/bokeh/examples/apps/player.py
similarity index 100%
rename from holoviews/plotting/bokeh/examples/apps/apps/player.py
rename to holoviews/plotting/bokeh/examples/apps/player.py
diff --git a/holoviews/plotting/bokeh/examples/apps/apps/selection_stream.py b/holoviews/plotting/bokeh/examples/apps/selection_stream.py
similarity index 80%
rename from holoviews/plotting/bokeh/examples/apps/apps/selection_stream.py
rename to holoviews/plotting/bokeh/examples/apps/selection_stream.py
index 5deb34fd7c..6d1f125868 100644
--- a/holoviews/plotting/bokeh/examples/apps/apps/selection_stream.py
+++ b/holoviews/plotting/bokeh/examples/apps/selection_stream.py
@@ -3,8 +3,7 @@
 import holoviews.plotting.bokeh
 from holoviews.streams import Selection1D
 
-hv.Store.current_backend = 'bokeh'
-renderer = hv.Store.renderers['bokeh'].instance(mode='server')
+renderer = hv.Store.renderers['bokeh']
 hv.Store.options(backend='bokeh').Points = hv.Options('plot', tools=['box_select'])
 
 data = np.random.multivariate_normal((0, 0), [[1, 0.1], [0.1, 1]], (1000,))
@@ -13,5 +12,6 @@
 mean_sel = hv.DynamicMap(lambda index: hv.HLine(points['y'][index].mean()
                                                 if index else -10),
                          kdims=[], streams=[sel])
-doc,_ = renderer((points * mean_sel))
+
+doc = renderer.app((points * mean_sel))
 doc.title = 'HoloViews Selection Stream'