diff --git a/r3-completion.bash b/r3-completion.bash
index b9c45e7..5047d00 100755
--- a/r3-completion.bash
+++ b/r3-completion.bash
@@ -13,7 +13,7 @@ r3_completions() {
   fi
 
   if [[ "${#COMP_WORDS[@]}" == "3" && ( "${COMP_WORDS[1]}" == "update-templates" || "${COMP_WORDS[1]}" == "update-options" || "${COMP_WORDS[1]}" == "update-methods" ) ]]; then
-    COMPREPLY=($(compgen -W "$(grep "r3 create" "${R3_V2_FOLDER}.r3_history" | sed "s/^.*r3 /r3 /" | sed "s/\s+/ /g" | sort --unique | cut -d' ' -f3 | sed 's/\([A-Z]\)/-\1/g' | awk '{print tolower($0)}' | sed "s/^/r3/" | sed "s/$/.js/" | perl -pe "s/\n/ /")" "${COMP_WORDS[2]}"))
+    COMPREPLY=($(compgen -W "$(grep "r3 create" "${R3_V2_FOLDER}.r3_history" | sed "s/^.*r3 /r3 /" | sed "s/\s+/ /g" | sort --unique | cut -d' ' -f3 | sed 's/\([A-Z]\)/-\1/g' | awk '{print tolower($0)}' | sed "s/^/r3/" | sed "s/^r3\-r3/r3/" | sed "s/$/.js/" | perl -pe "s/\n/ /")" "${COMP_WORDS[2]}"))
   fi
 
   if [[ "${#COMP_WORDS[@]}" == "3" && ( "${COMP_WORDS[1]}" == "create" ) ]]; then
diff --git a/r3-libs/r3-v2 b/r3-libs/r3-v2
index 40e85bf..7ee2b9f 160000
--- a/r3-libs/r3-v2
+++ b/r3-libs/r3-v2
@@ -1 +1 @@
-Subproject commit 40e85bf6d4c9e8872de9a0445e43d8b0bb646e30
+Subproject commit 7ee2b9f5eadba3189df4d4714009a9b2530e4435
diff --git a/r3.sh b/r3.sh
index bb4bff2..3a95692 100755
--- a/r3.sh
+++ b/r3.sh
@@ -166,6 +166,10 @@ then
       perl -p -i -e 's/^const Event.*\n$//' "${R3_FOLDER}${FILE_NAME}"
     fi
 
+    if [ "${EXTEND_CLASS}" = "Component" ]; then
+      perl -p -i -e 's/^const EXTEND_CLASS.*\n$//' "${R3_FOLDER}${FILE_NAME}"
+    fi
+
     if [ "${EXTEND_CLASS}" = "Utils" ]; then
       perl -p -i -e 's/^const Utils.*\n$//' "${R3_FOLDER}${FILE_NAME}"
     fi