diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index b7615e923b..41c6f0118e 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -256,7 +256,7 @@ class p_master
 			$lang_func = '_module_' . $short_name . '_lang';
 
 			// Custom function for calling parameters on module init (for example assigning template variables)
-			$custom_func = '_module_' . $short_name;
+			$custom_func = 'phpbb_module_' . $short_name;
 
 			$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
 
@@ -286,6 +286,14 @@ class p_master
 			{
 				$custom_func($row['module_mode'], $module_row);
 			}
+			else
+			{
+				$custom_func = '_module_' . $short_name;
+				if (function_exists($custom_func))
+				{
+					$custom_func($row['module_mode'], $module_row);
+				}
+			}
 
 			/**
 			* This event allows to modify parameters for building modules list
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3422236d19..d11193e4b0 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3549,7 +3549,7 @@ function phpbb_get_banned_user_ids($user_ids = array(), $ban_end = true)
 /**
 * Function for assigning a template var if the zebra module got included
 */
-function _module_zebra($mode, &$module_row)
+function phpbb_module_zebra($mode, &$module_row)
 {
 	global $template;