diff --git a/fastn-core/src/lib.rs b/fastn-core/src/lib.rs
index d370d653d4..ad15a92296 100644
--- a/fastn-core/src/lib.rs
+++ b/fastn-core/src/lib.rs
@@ -48,7 +48,7 @@ pub(crate) use tracker::Track;
 pub(crate) use translation::{TranslatedDocument, TranslationData};
 pub use {doc::resolve_foreign_variable2, doc::resolve_import};
 
-pub const FASTN_UI_INTERFACE: &str = "fastn-stack.github.io/fastn-ui";
+pub const FASTN_UI_INTERFACE: &str = "fastn-ui.fifthtry.site";
 pub const PACKAGE_THEME_INTERFACE: &str = "ftd-lang.github.io/theme";
 pub const NUMBER_OF_CRS_TO_RESERVE: usize = 5;
 
diff --git a/ftd/src/interpreter/utils.rs b/ftd/src/interpreter/utils.rs
index eec8843160..76fe8f0d0f 100644
--- a/ftd/src/interpreter/utils.rs
+++ b/ftd/src/interpreter/utils.rs
@@ -330,6 +330,10 @@ pub fn get_argument_for_reference_and_remaining(
     )>,
 > {
     if let Some((component_name, arguments)) = component_definition_name_with_arguments {
+        // To handle cases: (When package/site name starts with the component name)
+        // name: app-switcher.fifthtry-site#app-switcher.is-open
+        let name = name.trim_start_matches(format!("{}#", doc.name).as_str());
+
         if let Some(referenced_argument) = name
             .strip_prefix(format!("{}.", component_name).as_str())
             .or_else(|| name.strip_prefix(format!("{}#{}.", doc.name, component_name).as_str()))