diff --git a/Smarty.addons.php b/Smarty.addons.php
index 49b2ddf7..61cdfab6 100644
--- a/Smarty.addons.php
+++ b/Smarty.addons.php
@@ -56,15 +56,15 @@ function smarty_mod_spacify($string, $spacify_char = ' ')
 
 
 /*============================================*\
-  Custom functions
+  Custom tag functions
 \*============================================*/
 
 /*======================================================================*\
-	Function: smarty_func_options
+	Function: smarty_func_html_options
 	Purpose:  Returns the list of <option> tags generated from
 			  the passed parameters
 \*======================================================================*/
-function smarty_func_options()
+function smarty_func_html_options()
 {
 	extract(func_get_arg(0));
 
diff --git a/Smarty.class.php b/Smarty.class.php
index bf59c71a..f06648b9 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -41,7 +41,7 @@ class Smarty
 
 	var $config_dir				=	"configs";	// directory where config files are located
 
-	var $_custom_funcs			=	array(	'options'		=> 'smarty_func_options'
+	var $_custom_tags			=	array(	'html_options'	=> 'smarty_func_html_options'
 										 );
 	
 	var $_modifiers				=	array(	'lower'			=> 'strtolower',
@@ -408,8 +408,8 @@ class Smarty
 				return $this->left_delimiter.$tag_command.$this->right_delimiter;
 
 			default:
-				if (isset($this->_custom_funcs[$tag_command])) {
-					return $this->_compile_custom_func($tag_command, $tag_args);
+				if (isset($this->_custom_tags[$tag_command])) {
+					return $this->_compile_custom_tag($tag_command, $tag_args);
 				} else
 					/* TODO syntax error: unknown tag */
 				return "";
@@ -417,10 +417,10 @@ class Smarty
 	}
 
 
-	function _compile_custom_func($func_name, $tag_args)
+	function _compile_custom_tag($tag_command, $tag_args)
 	{
 		$attrs = $this->_parse_attrs($tag_args);
-		$function = $this->_custom_funcs[$func_name];
+		$function = $this->_custom_tags[$tag_command];
 		foreach ($attrs as $arg_name => $arg_value)
 			$arg_list[] = "'$arg_name' => $arg_value";
 
diff --git a/demo/templates/index.tpl b/demo/templates/index.tpl
index 8b12f2de..b262b9bd 100644
--- a/demo/templates/index.tpl
+++ b/demo/templates/index.tpl
@@ -18,4 +18,4 @@ My interests are:
 {/section}
 {/strip}
 
-{options output=$FirstName values=$LastName selected="Case"}
+{html_options output=$FirstName values=$LastName selected="Case"}
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index bf59c71a..f06648b9 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -41,7 +41,7 @@ class Smarty
 
 	var $config_dir				=	"configs";	// directory where config files are located
 
-	var $_custom_funcs			=	array(	'options'		=> 'smarty_func_options'
+	var $_custom_tags			=	array(	'html_options'	=> 'smarty_func_html_options'
 										 );
 	
 	var $_modifiers				=	array(	'lower'			=> 'strtolower',
@@ -408,8 +408,8 @@ class Smarty
 				return $this->left_delimiter.$tag_command.$this->right_delimiter;
 
 			default:
-				if (isset($this->_custom_funcs[$tag_command])) {
-					return $this->_compile_custom_func($tag_command, $tag_args);
+				if (isset($this->_custom_tags[$tag_command])) {
+					return $this->_compile_custom_tag($tag_command, $tag_args);
 				} else
 					/* TODO syntax error: unknown tag */
 				return "";
@@ -417,10 +417,10 @@ class Smarty
 	}
 
 
-	function _compile_custom_func($func_name, $tag_args)
+	function _compile_custom_tag($tag_command, $tag_args)
 	{
 		$attrs = $this->_parse_attrs($tag_args);
-		$function = $this->_custom_funcs[$func_name];
+		$function = $this->_custom_tags[$tag_command];
 		foreach ($attrs as $arg_name => $arg_value)
 			$arg_list[] = "'$arg_name' => $arg_value";
 
diff --git a/templates/index.tpl b/templates/index.tpl
index 8b12f2de..b262b9bd 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -18,4 +18,4 @@ My interests are:
 {/section}
 {/strip}
 
-{options output=$FirstName values=$LastName selected="Case"}
+{html_options output=$FirstName values=$LastName selected="Case"}