diff --git a/expected/pg_ivm.out b/expected/pg_ivm.out
index 524e300..61526b4 100644
--- a/expected/pg_ivm.out
+++ b/expected/pg_ivm.out
@@ -81,6 +81,21 @@ SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
  4 | 40 | 104
 (4 rows)
 
+-- test for renaming column name to camel style
+BEGIN;
+ALTER TABLE mv_base_a RENAME i TO "I";
+ALTER TABLE mv_base_a RENAME j TO "J";
+UPDATE mv_base_a SET "J" = 0 WHERE "I" = 1;
+SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
+ i | j  |  k  
+---+----+-----
+ 1 |  0 | 101
+ 2 | 20 | 102
+ 3 | 30 | 103
+ 4 | 40 | 104
+(4 rows)
+
+ROLLBACK;
 -- TRUNCATE a base table in join views
 BEGIN;
 TRUNCATE mv_base_a;
diff --git a/matview.c b/matview.c
index d9b9db6..66709b5 100644
--- a/matview.c
+++ b/matview.c
@@ -1612,7 +1612,7 @@ make_subquery_targetlist_from_table(MV_TriggerTable *table)
 		if (attr->attisdropped)
 			appendStringInfo(&str, "null");
 		else
-			appendStringInfo(&str, "%s", NameStr(attr->attname));
+			appendStringInfo(&str, "%s", quote_identifier(NameStr(attr->attname)));
 	}
 
 	return str.data;
diff --git a/sql/pg_ivm.sql b/sql/pg_ivm.sql
index 5dbd396..6d917ea 100644
--- a/sql/pg_ivm.sql
+++ b/sql/pg_ivm.sql
@@ -37,6 +37,14 @@ SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
 ROLLBACK;
 SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
 
+-- test for renaming column name to camel style
+BEGIN;
+ALTER TABLE mv_base_a RENAME i TO "I";
+ALTER TABLE mv_base_a RENAME j TO "J";
+UPDATE mv_base_a SET "J" = 0 WHERE "I" = 1;
+SELECT * FROM mv_ivm_1 ORDER BY 1,2,3;
+ROLLBACK;
+
 -- TRUNCATE a base table in join views
 BEGIN;
 TRUNCATE mv_base_a;