diff --git a/lib/hawat/app.py b/lib/hawat/app.py
index cc1bda0a6686b0b62ba0b262d8b3854485e144f9..33fa4c5b924326076293c3293a6c47d10d703c6d 100644
--- a/lib/hawat/app.py
+++ b/lib/hawat/app.py
@@ -270,7 +270,7 @@ def _setup_app_core(app):
             """
             Return dictionary of all registered application view endpoints.
             """
-            return flask.current_app.view_classes
+            return flask.current_app.view_functions
 
         def get_endpoint_class(endpoint, quiet = False):
             """
@@ -290,7 +290,7 @@ def _setup_app_core(app):
             :return: ``True`` in case endpoint exists, ``False`` otherwise.
             :rtype: bool
             """
-            return endpoint in app.view_classes
+            return endpoint in app.view_functions
 
         def get_icon(icon_name, default_icon = 'missing-icon'):
             """
@@ -318,7 +318,7 @@ def _setup_app_core(app):
             :rtype: flask.Markup
             """
             return flask.Markup(
-                hawat.const.FA_ICONS[app.view_classes.get(endpoint).module_ref().get_module_icon()]
+                hawat.const.FA_ICONS[app.get_endpoint_class(endpoint).module_ref().get_module_icon()]
             )
 
         def get_endpoint_icon(endpoint):
@@ -330,7 +330,7 @@ def _setup_app_core(app):
             :rtype: flask.Markup
             """
             return flask.Markup(
-                hawat.const.FA_ICONS[app.view_classes.get(endpoint).get_view_icon()]
+                hawat.const.FA_ICONS[app.get_endpoint_class(endpoint).get_view_icon()]
             )
 
         def get_csag(group):