diff --git a/frontend/src/components/CommunicationArea.vue b/frontend/src/components/CommunicationArea.vue
index f5495224..ecd3364b 100644
--- a/frontend/src/components/CommunicationArea.vue
+++ b/frontend/src/components/CommunicationArea.vue
@@ -106,7 +106,7 @@ const reload = defineModel('reload')
 const emit = defineEmits(['scroll'])
 
 const { getUser } = usersStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const showEmailBox = ref(false)
 const showCommentBox = ref(false)
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index d53b405b..17a5d237 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -310,7 +310,7 @@ function getIcon(routeName, icon) {
 // onboarding
 const { user } = sessionStore()
 const { users, isManager } = usersStore()
-const { isOnboardingStepsCompleted, setUp } = useOnboarding('frappecrm')
+const { isOnboardingStepsCompleted, setUp } = useOnboarding('jingrowcrm')
 
 async function getFirstLead() {
   let firstLead = localStorage.getItem('firstLead' + user)
diff --git a/frontend/src/components/Modals/AboutModal.vue b/frontend/src/components/Modals/AboutModal.vue
index 7e05a3a8..da397002 100644
--- a/frontend/src/components/Modals/AboutModal.vue
+++ b/frontend/src/components/Modals/AboutModal.vue
@@ -65,7 +65,7 @@ let links = [
   },
   {
     label: __('Telegram Channel'),
-    url: 'https://t.me/frappecrm',
+    url: 'https://t.me/jingrowcrm',
     icon: TelegramIcon,
   },
   {
diff --git a/frontend/src/components/Modals/ChangePasswordModal.vue b/frontend/src/components/Modals/ChangePasswordModal.vue
index 4a981447..c1d529f0 100644
--- a/frontend/src/components/Modals/ChangePasswordModal.vue
+++ b/frontend/src/components/Modals/ChangePasswordModal.vue
@@ -64,7 +64,7 @@ import { ref, watch } from 'vue'
 const show = defineModel()
 
 const { getUser } = usersStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const newPassword = ref('')
 const confirmPassword = ref('')
diff --git a/frontend/src/components/Modals/ConvertToDealModal.vue b/frontend/src/components/Modals/ConvertToDealModal.vue
index 343a47fc..8100586a 100644
--- a/frontend/src/components/Modals/ConvertToDealModal.vue
+++ b/frontend/src/components/Modals/ConvertToDealModal.vue
@@ -117,7 +117,7 @@ const router = useRouter()
 const { statusOptions, getDealStatus } = statusesStore()
 const { isManager } = usersStore()
 const { user } = sessionStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const existingContactChecked = ref(false)
 const existingOrganizationChecked = ref(false)
diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue
index 0876b02f..edb82668 100644
--- a/frontend/src/components/Modals/LeadModal.vue
+++ b/frontend/src/components/Modals/LeadModal.vue
@@ -66,7 +66,7 @@ const props = defineProps({
 const { user } = sessionStore()
 const { getUser, isManager } = usersStore()
 const { getLeadStatus, statusOptions } = statusesStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const show = defineModel()
 const router = useRouter()
diff --git a/frontend/src/components/Modals/NoteModal.vue b/frontend/src/components/Modals/NoteModal.vue
index 7f721f88..167096e9 100644
--- a/frontend/src/components/Modals/NoteModal.vue
+++ b/frontend/src/components/Modals/NoteModal.vue
@@ -88,7 +88,7 @@ const emit = defineEmits(['after'])
 
 const router = useRouter()
 
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const error = ref(null)
 const title = ref(null)
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 25f232cd..923cc3f5 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -146,7 +146,7 @@ const emit = defineEmits(['updateTask', 'after'])
 
 const router = useRouter()
 const { users, getUser } = usersStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 
 const error = ref(null)
 const title = ref(null)
diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index 532a7a74..24849570 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -101,7 +101,7 @@ import { createListResource, createResource, FormControl } from 'jingrow-ui'
 import { useOnboarding } from 'jingrow-ui/jingrow'
 import { ref, computed } from 'vue'
 
-const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { updateOnboardingStep } = useOnboarding('jingrowcrm')
 const { users, isAdmin, isManager } = usersStore()
 
 const invitees = ref([])
diff --git a/frontend/src/components/Settings/emailConfig.js b/frontend/src/components/Settings/emailConfig.js
index 0d88ae43..5accf57d 100644
--- a/frontend/src/components/Settings/emailConfig.js
+++ b/frontend/src/components/Settings/emailConfig.js
@@ -6,7 +6,7 @@ const LogoSendgrid = '/images/sendgrid.png'
 const LogoSparkpost = '/images/sparkpost.webp'
 const LogoYahoo = '/images/yahoo.png'
 const LogoYandex = '/images/yandex.png'
-const LogoFrappeMail = '/images/jingrow-mail.svg'
+const LogoJingrowMail = '/images/jingrow-mail.svg'
 
 const fixedFields = [
   {
@@ -74,7 +74,7 @@ export const customProviderFields = [
     label: 'Jingrow Mail Site',
     name: 'jingrow_mail_site',
     type: 'text',
-    placeholder: 'https://frappemail.com',
+    placeholder: 'https://jingrowmail.com',
   },
   {
     label: 'API Key',
@@ -141,7 +141,7 @@ export const services = [
   },
   {
     name: 'Jingrow Mail',
-    icon: LogoFrappeMail,
+    icon: LogoJingrowMail,
     info: __(
       `Setting up Jingrow Mail requires you to have an API key and API Secret of your email account. Read more `,
     ),
@@ -157,7 +157,7 @@ export const emailIcon = {
   SparkPost: LogoSparkpost,
   Yahoo: LogoYahoo,
   Yandex: LogoYandex,
-  'Jingrow Mail': LogoFrappeMail,
+  'Jingrow Mail': LogoJingrowMail,
 }
 
 export function validateInputs(state, isCustom) {
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index bb2113a1..7ae96cd5 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -50,14 +50,14 @@
 
 <script setup>
 import BrandLogo from '@/components/BrandLogo.vue'
-import FrappeCloudIcon from '@/components/Icons/FrappeCloudIcon.vue'
+import JingrowCloudIcon from '@/components/Icons/JingrowCloudIcon.vue'
 import Apps from '@/components/Apps.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
 import { getSettings } from '@/stores/settings'
 import { showSettings, isMobileView } from '@/composables/settings'
 import { showAboutModal } from '@/composables/modals'
-import { confirmLoginToFrappeCloud } from '@/composables/jingrowcloud'
+import { confirmLoginToJingrowCloud } from '@/composables/jingrowcloud'
 import { Dropdown } from 'jingrow-ui'
 import { theme, toggleTheme } from '@/stores/theme'
 import { computed, h, markRaw } from 'vue'
@@ -147,9 +147,9 @@ function getStandardItem(item) {
       }
     case 'login_to_fc':
       return {
-        icon: h(FrappeCloudIcon),
+        icon: h(JingrowCloudIcon),
         label: __(item.label),
-        onClick: () => confirmLoginToFrappeCloud(),
+        onClick: () => confirmLoginToJingrowCloud(),
         condition: () => !isMobileView.value && window.is_fc_site,
       }
     case 'about':
diff --git a/frontend/src/composables/jingrowcloud.js b/frontend/src/composables/jingrowcloud.js
index f0e31caf..51d9d0e2 100644
--- a/frontend/src/composables/jingrowcloud.js
+++ b/frontend/src/composables/jingrowcloud.js
@@ -14,7 +14,7 @@ export const currentSiteInfo = createResource({
   },
 })
 
-export const confirmLoginToFrappeCloud = () => {
+export const confirmLoginToJingrowCloud = () => {
   currentSiteInfo.fetch()
 
   const { $dialog } = globalStore()
@@ -29,7 +29,7 @@ export const confirmLoginToFrappeCloud = () => {
         label: __('Confirm'),
         variant: 'solid',
         onClick(close) {
-          loginToFrappeCloud()
+          loginToJingrowCloud()
           close()
         },
       },
@@ -37,7 +37,7 @@ export const confirmLoginToFrappeCloud = () => {
   })
 }
 
-const loginToFrappeCloud = () => {
+const loginToJingrowCloud = () => {
   window.open(
     `${baseEndpoint.value}/dashboard/sites/${siteName.value}`,
     '_blank',
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index dc08d4f9..56ed683d 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -383,7 +383,7 @@ const { statusOptions, getDealStatus } = statusesStore()
 const { doctypeMeta } = getMeta('CRM Deal')
 
 const { updateOnboardingStep, isOnboardingStepsCompleted } =
-  useOnboarding('frappecrm')
+  useOnboarding('jingrowcrm')
 
 const route = useRoute()
 const router = useRouter()
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index 3c9b4fa7..f3bbf5c5 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -1,7 +1,7 @@
-import frappeUIPreset from 'jingrow-ui/src/tailwind/preset'
+import jingrowUIPreset from 'jingrow-ui/src/tailwind/preset'
 
 export default {
-  presets: [frappeUIPreset],
+  presets: [jingrowUIPreset],
   content: [
     './index.html',
     './src/**/*.{vue,js,ts,jsx,tsx}',
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index a718c43f..87a676e4 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -8,12 +8,12 @@ import { VitePWA } from 'vite-plugin-pwa'
 // https://vitejs.dev/config/
 export default defineConfig(async ({ mode }) => {
   const isDev = mode === 'development'
-  const jingrowui = await importFrappeUIPlugin(isDev)
+  const jingrowui = await importJingrowUIPlugin(isDev)
 
   const config = {
     plugins: [
       jingrowui({
-        frappeProxy: true,
+        jingrowProxy: true,
         lucideIcons: true,
         jinjaBootData: true,
         buildConfig: {
@@ -88,9 +88,9 @@ export default defineConfig(async ({ mode }) => {
     try {
       // Check if the local jingrow-ui directory exists
       const fs = await import('node:fs')
-      const localFrappeUIPath = path.resolve(__dirname, '../jingrow-ui')
-      if (fs.existsSync(localFrappeUIPath)) {
-        config.resolve.alias['jingrow-ui'] = localFrappeUIPath
+      const localJingrowUIPath = path.resolve(__dirname, '../jingrow-ui')
+      if (fs.existsSync(localJingrowUIPath)) {
+        config.resolve.alias['jingrow-ui'] = localJingrowUIPath
       } else {
         console.warn('Local jingrow-ui directory not found, using npm package')
       }
@@ -105,7 +105,7 @@ export default defineConfig(async ({ mode }) => {
   return config
 })
 
-async function importFrappeUIPlugin(isDev) {
+async function importJingrowUIPlugin(isDev) {
   if (isDev) {
     try {
       const module = await import('../jingrow-ui/vite')