diff --git a/crates/parser/src/grammar/declaration.rs b/crates/parser/src/grammar/declaration.rs
index c23223d..d3459af 100644
--- a/crates/parser/src/grammar/declaration.rs
+++ b/crates/parser/src/grammar/declaration.rs
@@ -1,4 +1,4 @@
-use super::{expression::expression, list::{expression_tuple, identifier_tuple}};
+use super::{expression::expression, list::{tuple_expression, tuple_identifier}};
 use crate::{parser::Parser, token_kind::TokenKind::*};
 
 // [N][M-1]
@@ -91,7 +91,7 @@ pub(super) fn var_declaration(p: &mut Parser) {
     // tuple of variables
     // eg: var (in1, in2, in3) = (1, 2, 3);
     if p.at(LParen) {
-        identifier_tuple(p);
+        tuple_identifier(p);
         if p.at_var_assign() {
             p.advance();
             expression(p);
@@ -129,7 +129,7 @@ pub(super) fn signal_declaration(p: &mut Parser) {
     // tuple of signal
     // eg: signal (in1, in2, in3) <== tuple_value;
     if p.at(LParen) {
-        identifier_tuple(p);
+        tuple_identifier(p);
         // can not assign for input signal
         if assign_able && p.at_inline_assign_signal() {
             p.advance();
@@ -184,7 +184,7 @@ pub(super) fn component_declaration(p: &mut Parser) {
 
         // template params
         let parameter_marker = p.open();
-        expression_tuple(p);
+        tuple_expression(p);
         p.close(parameter_marker, Call);
     }
 
diff --git a/crates/parser/src/grammar/expression.rs b/crates/parser/src/grammar/expression.rs
index 2d34bef..b7105ec 100644
--- a/crates/parser/src/grammar/expression.rs
+++ b/crates/parser/src/grammar/expression.rs
@@ -1,4 +1,4 @@
-use list::expression_tuple;
+use list::tuple_expression;
 
 use crate::parser::Marker;
 
@@ -112,7 +112,7 @@ pub fn expression_rec(p: &mut Parser, pb: u16) -> Option<Marker> {
                 LParen => {
                     // function call
                     let open_marker = p.open_before(lhs);
-                    expression_tuple(p);
+                    tuple_expression(p);
                     lhs = p.close(open_marker, Call);
                 }
                 LBracket => {
diff --git a/crates/parser/src/grammar/function.rs b/crates/parser/src/grammar/function.rs
index 283f622..431df8a 100644
--- a/crates/parser/src/grammar/function.rs
+++ b/crates/parser/src/grammar/function.rs
@@ -1,4 +1,4 @@
-use list::identifier_tuple;
+use list::tuple_identifier;
 
 use crate::grammar::*;
 
@@ -13,7 +13,7 @@ pub fn function_parse(p: &mut Parser) {
     p.close(fn_name_marker, FunctionName);
 
     let parameter_marker = p.open();
-    identifier_tuple(p);
+    tuple_identifier(p);
     p.close(parameter_marker, ParameterList);
     
     block::block(p);
diff --git a/crates/parser/src/grammar/list.rs b/crates/parser/src/grammar/list.rs
index 83e58d4..6d76cb8 100644
--- a/crates/parser/src/grammar/list.rs
+++ b/crates/parser/src/grammar/list.rs
@@ -7,7 +7,7 @@ use crate::grammar::{
  * grammar: "(expression-1, expression-2,..., expression-n)"
  * can be an empty ()
  */
-pub(super) fn expression_tuple(p: &mut Parser) {
+pub(super) fn tuple_expression(p: &mut Parser) {
     // let m = p.open();
     p.expect(LParen);
 
@@ -30,7 +30,7 @@ pub(super) fn expression_tuple(p: &mut Parser) {
  * grammar: "(iden1, iden2,..., idenn)"
  * can be an empty ()
  */
-pub(super) fn identifier_tuple(p: &mut Parser) {
+pub(super) fn tuple_identifier(p: &mut Parser) {
     // let m = p.open();
     p.expect(LParen);
 
@@ -51,7 +51,7 @@ pub(super) fn identifier_tuple(p: &mut Parser) {
  * grammar: "[iden1, iden2,..., idenn]"
  * can be an empty ()
  */
-pub(super) fn identifier_list(p: &mut Parser) {
+pub(super) fn list_identifier(p: &mut Parser) {
     // let m = p.open();
     p.expect(LBracket);
 
diff --git a/crates/parser/src/grammar/main_component.rs b/crates/parser/src/grammar/main_component.rs
index 7efdea8..b61fbac 100644
--- a/crates/parser/src/grammar/main_component.rs
+++ b/crates/parser/src/grammar/main_component.rs
@@ -1,4 +1,4 @@
-use list::identifier_list;
+use list::list_identifier;
 
 use super::*;
 
@@ -15,7 +15,7 @@ pub fn main_component(p: &mut Parser) {
         p.expect(LCurly);
         p.expect(PublicKw);
         p.expect(LBracket);
-        identifier_list(p);
+        list_identifier(p);
         p.expect(RBracket);
     }
 
diff --git a/crates/parser/src/grammar/template.rs b/crates/parser/src/grammar/template.rs
index 1c70156..3686ead 100644
--- a/crates/parser/src/grammar/template.rs
+++ b/crates/parser/src/grammar/template.rs
@@ -1,4 +1,4 @@
-use list::identifier_tuple;
+use list::tuple_identifier;
 
 use crate::grammar::*;
 /**
@@ -16,7 +16,7 @@ pub fn template(p: &mut Parser) {
     p.close(name_marker, TemplateName);
 
     let parameter_marker = p.open();
-    identifier_tuple(p);
+    tuple_identifier(p);
     p.close(parameter_marker, ParameterList);
 
     block::block(p);