diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index c457057..a46db4d 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -39,6 +39,6 @@ jobs:
                   distributionId: "${{ secrets.DISTRIBUTION_ID }}"
                   bucket: testcrudbucket
                   source: ./dist
-                  destination: /calculation/latest
+                  destination: /calculate/latest
                   acl: public-read
                   invalidations: ${{ github.event.inputs.invalidations }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e2dfe1..dc59612 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,19 +1,19 @@
-# Contributing to CoCreate-calculations
+# Contributing to CoCreate-calculate
 
-This project is work of [many contributors](https://github.com/CoCreate-app/CoCreate-calculations/graphs/contributors).
-You're encouraged to submit [pull requests](https://github.com/CoCreate-app/CoCreate-calculations/pulls),
-[propose features and discuss issues](https://github.com/CoCreate-app/CoCreate-calculations/issues).
+This project is work of [many contributors](https://github.com/CoCreate-app/CoCreate-calculate/graphs/contributors).
+You're encouraged to submit [pull requests](https://github.com/CoCreate-app/CoCreate-calculate/pulls),
+[propose features and discuss issues](https://github.com/CoCreate-app/CoCreate-calculate/issues).
 
 In the examples below, substitute your Github username for `contributor` in URLs.
 
 ## Fork the Project
 
-Fork the [project on Github](https://github.com/CoCreate-app/CoCreate-calculations) and check out your copy.
+Fork the [project on Github](https://github.com/CoCreate-app/CoCreate-calculate) and check out your copy.
 
 ```
-git calculations https://github.com/contributor/CoCreate-calculations.git
-cd CoCreate-calculations
-git remote add upstream https://github.com/CoCreate-app/CoCreate-calculations.git
+git clone https://github.com/contributor/CoCreate-calculate.git
+cd CoCreate-calculate
+git remote add upstream https://github.com/CoCreate-app/CoCreate-calculate.git
 ```
 
 ## Create a Topic Branch
@@ -50,7 +50,7 @@ git config --global user.email "contributor@example.com"
 ```
 
 We use [semantic-release](https://github.com/semantic-release/semantic-release) as process to generate changelog
-and to release. Write meaningful commits according to 
+and to release. Write meaningful commits according to
 [Commit Message Formats](https://github.com/semantic-release/semantic-release#commit-message-format) is important.
 
 ```
@@ -66,7 +66,6 @@ Here is an example of the release type that should be done based on a [semantic-
 | `feat(pencil): add 'graphiteWidth' option`                                                                                                                                                       | ~~Minor~~ Feature Release  |
 | `perf(pencil): remove graphiteWidth option`<br><br>`BREAKING CHANGE: The graphiteWidth option has been removed.`<br>`The default graphite width of 10mm is always used for performance reasons.` | ~~Major~~ Breaking Release |
 
-
 ## Push
 
 ```
@@ -75,7 +74,7 @@ git push origin my-feature-branch
 
 ## Make a Pull Request
 
-Go to [https://github.com/CoCreate-app/CoCreate-calculations](https://github.com/CoCreate-app/CoCreate-calculations) and select your feature branch.
+Go to [https://github.com/CoCreate-app/CoCreate-calculate](https://github.com/CoCreate-app/CoCreate-calculate) and select your feature branch.
 Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
 
 ## Rebase
@@ -94,4 +93,4 @@ It's likely that your change will not be merged and that the nitpicky maintainer
 
 ## Thank You
 
-Please do know that we really appreciate and value your time and work. We love you, really.
\ No newline at end of file
+Please do know that we really appreciate and value your time and work. We love you, really.
diff --git a/CoCreate.config.js b/CoCreate.config.js
index b70bfe9..4697e26 100644
--- a/CoCreate.config.js
+++ b/CoCreate.config.js
@@ -8,13 +8,13 @@ module.exports = {
             "object": {
                 "_id": "6019bade4eea0817df303b0a",
                 "name": "index.html",
-                "path": "/docs/calculation",
-                "pathname": "/docs/calculation/index.html",
+                "path": "/docs/calculate",
+                "pathname": "/docs/calculate/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
                     "*"
                 ],
-                "directory": "calculation",
+                "directory": "calculate",
                 "content-type": "{{content-type}}",
                 "public": "true"
             }
diff --git a/README.md b/README.md
index 76b3e13..8076f09 100644
--- a/README.md
+++ b/README.md
@@ -1,85 +1,85 @@
-# CoCreate-calculation
+# CoCreate-calculate
 
-A handy vanilla JavaScript calculator, concatenate multiple elements containing integers & execute calculations. Can be used for creating invoices,making payments & any kind of complex calculation. Easily configured using HTML5 attributes and/or JavaScript API. Take it for a spin in our [playground!](https://cocreate.app/docs/calculation)
+A handy vanilla JavaScript calculator, concatenate multiple elements containing integers & execute calculate. Can be used for creating invoices,making payments & any kind of complex calculate. Easily configured using HTML5 attributes and/or JavaScript API. Take it for a spin in our [playground!](https://cocreate.app/docs/calculate)
 
-![minified](https://img.badgesize.io/https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.js?style=flat-square&label=minified&color=orange)
-![gzip](https://img.badgesize.io/https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.js?compression=gzip&style=flat-square&label=gzip&color=yellow)
-![brotli](https://img.badgesize.io/https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.js?compression=brotli&style=flat-square&label=brotli)
-![GitHub latest release](https://img.shields.io/github/v/release/CoCreate-app/CoCreate-calculation?style=flat-square)
-![License](https://img.shields.io/github/license/CoCreate-app/CoCreate-calculation?style=flat-square)
+![minified](https://img.badgesize.io/https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.js?style=flat-square&label=minified&color=orange)
+![gzip](https://img.badgesize.io/https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.js?compression=gzip&style=flat-square&label=gzip&color=yellow)
+![brotli](https://img.badgesize.io/https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.js?compression=brotli&style=flat-square&label=brotli)
+![GitHub latest release](https://img.shields.io/github/v/release/CoCreate-app/CoCreate-calculate?style=flat-square)
+![License](https://img.shields.io/github/license/CoCreate-app/CoCreate-calculate?style=flat-square)
 ![Hiring](https://img.shields.io/static/v1?style=flat-square&label=&message=Hiring&color=blueviolet)
 
-![CoCreate-calculation](https://cdn.cocreate.app/docs/CoCreate-calculation.gif)
+![CoCreate-calculate](https://cdn.cocreate.app/docs/CoCreate-calculate.gif)
 
-## [Docs & Demo](https://cocreate.app/docs/calculation)
+## [Docs & Demo](https://cocreate.app/docs/calculate)
 
-For a complete guide and working demo refer to the [doumentation](https://cocreate.app/docs/calculation)
+For a complete guide and working demo refer to the [doumentation](https://cocreate.app/docs/calculate)
 
 ## CDN
 
 ```html
-<script src="https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.js"></script>
+<script src="https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.js"></script>
 ```
 
 ```html
-<script src="https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.css"></script>
+<script src="https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.css"></script>
 ```
 
 ## NPM
 
 ```shell
-$ npm i @cocreate/calculation
+$ npm i @cocreate/calculate
 ```
 
 ## yarn
 
 ```shell
-$ yarn install @cocreate/calculation
+$ yarn install @cocreate/calculate
 ```
 
 # Table of Contents
 
-- [Table of Contents](#table-of-contents)
-- [Announcements](#announcements)
-- [Roadmap](#roadmap)
-- [How to Contribute](#how-to-contribute)
-- [About](#about)
-- [License](#license)
+-   [Table of Contents](#table-of-contents)
+-   [Announcements](#announcements)
+-   [Roadmap](#roadmap)
+-   [How to Contribute](#how-to-contribute)
+-   [About](#about)
+-   [License](#license)
 
 <a name="announcements"></a>
 
 # Announcements
 
-All updates to this library are documented in our [CHANGELOG](https://github.com/CoCreate-app/CoCreate-calculation/blob/master/CHANGELOG.md) and [releases](https://github.com/CoCreate-app/CoCreate-calculation/releases). You may also subscribe to email for releases and breaking changes.
+All updates to this library are documented in our [CHANGELOG](https://github.com/CoCreate-app/CoCreate-calculate/blob/master/CHANGELOG.md) and [releases](https://github.com/CoCreate-app/CoCreate-calculate/releases). You may also subscribe to email for releases and breaking changes.
 
 <a name="roadmap"></a>
 
 # Roadmap
 
-If you are interested in the future direction of this project, please take a look at our open [issues](https://github.com/CoCreate-app/CoCreate-calculation/issues) and [pull requests](https://github.com/CoCreate-app/CoCreate-calculation/pulls). We would love to hear your feedback.
+If you are interested in the future direction of this project, please take a look at our open [issues](https://github.com/CoCreate-app/CoCreate-calculate/issues) and [pull requests](https://github.com/CoCreate-app/CoCreate-calculate/pulls). We would love to hear your feedback.
 
 <a name="about"></a>
 
 # About
 
-CoCreate-calculation is guided and supported by the CoCreate Developer Experience Team.
+CoCreate-calculate is guided and supported by the CoCreate Developer Experience Team.
 
 Please Email the Developer Experience Team [here](mailto:develop@cocreate.app) in case of any queries.
 
-CoCreate-calculation is maintained and funded by CoCreate. The names and logos for CoCreate are trademarks of CoCreate, LLC.
+CoCreate-calculate is maintained and funded by CoCreate. The names and logos for CoCreate are trademarks of CoCreate, LLC.
 
 <a name="contribute"></a>
 
 # How to Contribute
 
-We encourage contribution to our libraries (you might even score some nifty swag), please see our [CONTRIBUTING](https://github.com/CoCreate-app/CoCreate-calculation/blob/master/CONTRIBUTING.md) guide for details.
+We encourage contribution to our libraries (you might even score some nifty swag), please see our [CONTRIBUTING](https://github.com/CoCreate-app/CoCreate-calculate/blob/master/CONTRIBUTING.md) guide for details.
 
-We want this library to be community-driven, and CoCreate led. We need your help to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/CoCreate-app/CoCreate-calculation/issues) and [pull requests](https://github.com/CoCreate-app/CoCreate-calculation/pulls) or merely upvote or comment on existing issues or pull requests.
+We want this library to be community-driven, and CoCreate led. We need your help to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/CoCreate-app/CoCreate-calculate/issues) and [pull requests](https://github.com/CoCreate-app/CoCreate-calculate/pulls) or merely upvote or comment on existing issues or pull requests.
 
 We appreciate your continued support, thank you!
 
-
 <a name="license"></a>
+
 # License
 
-[The MIT License (MIT)](https://github.com/CoCreate-app/CoCreate-calculation/blob/master/LICENSE)
+[The MIT License (MIT)](https://github.com/CoCreate-app/CoCreate-calculate/blob/master/LICENSE)
diff --git a/demo/index.html b/demo/index.html
index d547e7d..4b475bf 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <title>Calculations | CoCreateJS</title>
+        <title>Calculate | CoCreateJS</title>
         <!-- CoCreate Favicon -->
         <link
             rel="icon"
@@ -24,7 +24,7 @@ <h1 calculate="{[key='total']} + {#te}">sum</h1>
         <!--<h1 calculate="1 + {#id1} * 5 + {#id3}/{#id2} + {#id2}"></h1>-->
         <!--<h1 calculate="(({#id1} + {#id2})) * {#id3}"></h1>-->
 
-        <!--<script src="../dist/CoCreate-calculation.js"></script>-->
+        <!--<script src="../dist/CoCreate-calculate.js"></script>-->
         <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index c5c3231..0a3c68b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>CoCreate-calculations Documentation | CoCreateJS</title>
+        <title>CoCreate-calculate Documentation | CoCreateJS</title>
         <link
             rel="icon"
             type="image/png"
@@ -12,14 +12,14 @@
             href="https://cocreate.app/images/favicon.ico" />
         <meta
             name="description"
-            content="A handy JavaScript calculator,concatenate multiple inputs containing integers &amp; execute calculations.Can be used for invoices,payments &amp; any complex calculation" />
+            content="A handy JavaScript calculator,concatenate multiple inputs containing integers &amp; execute calculate.Can be used for invoices,payments &amp; any complex calculate" />
         <meta
             name="keywords"
             content="helper classes, utility classes, css framework, css library, inline style classes" />
         <meta name="robots" content="index,follow" />
         <meta
             property="og:image"
-            content="https://cdn.cocreate.app/docs/calculation.png" />
+            content="https://cdn.cocreate.app/docs/calculate.png" />
 
         <!-- CoCreate CSS -->
         <link
@@ -63,11 +63,11 @@
         <main
             class="padding-top:15px padding:15px@lg@xl"
             content_id="content"
-            id="cocreate-calculations">
+            id="cocreate-calculate">
             <div
                 class="display:flex flex-wrap:wrap justify-content:space-between position:relative margin:10px">
                 <div class="display:flex align-items:center">
-                    <h2>CoCreate-calculations</h2>
+                    <h2>CoCreate-calculate</h2>
                 </div>
                 <div
                     class="display:flex align-items:center font-size:20px position:absolute right:0 padding:5px background:white">
@@ -78,7 +78,7 @@ <h2>CoCreate-calculations</h2>
                         share-title="testing im a title"
                         share-height="600"
                         share-width="700"
-                        share-media="https://cdn.cocreate.app/docs/calculation.png"
+                        share-media="https://cdn.cocreate.app/docs/calculate.png"
                         hover="display:block!important"
                         hover-selector=".social-networks">
                         <div class="display:none social-networks">
@@ -126,7 +126,7 @@ <h2>CoCreate-calculations</h2>
                     ></a>
                 </div>
                 <a
-                    href="https://github.com/CoCreate-app/CoCreate-calculations"
+                    href="https://github.com/CoCreate-app/CoCreate-calculate"
                     target="_blank"
                     class="margin-right:15px"
                     ><i
@@ -138,28 +138,28 @@ <h2>CoCreate-calculations</h2>
             <h1
                 class="max-width:500px margin:20px_10px line-height:1.5 font-size:16px font-weight:100">
                 A handy vanilla JavaScript calculator, concatenate multiple
-                elements containing integers &amp; execute calculations. Can be
+                elements containing integers &amp; execute calculate. Can be
                 used for creating invoices,making payments &amp; any kind of
-                complex calculation. Easily configured using HTML5 attributes
+                complex calculate. Easily configured using HTML5 attributes
                 and/or JavaScript API.
             </h1>
-            <div id="calculations-section" class="display:flex flex-wrap:wrap">
+            <div id="calculate-section" class="display:flex flex-wrap:wrap">
                 <div
                     class="flex-grow:1 width:400px width:300px@xs padding:0px_10px margin-top:60px">
                     <div
-                        id="calculation-install"
+                        id="calculate-install"
                         class="border-bottom:1px_solid_lightgrey"
                         scroll
                         scroll-intersect="color:dodgerblue"
-                        scroll-selector="#calculation-install-section">
+                        scroll-selector="#calculate-install-section">
                         <span
                             class="display:flex align-items:center width:fit-content"
                             hover="display:block!important"
-                            hover-selector="[href='#calculation-install']">
+                            hover-selector="[href='#calculate-install']">
                             <h2 class="padding:5px_0px">Install</h2>
                             <a
                                 class="margin-left:10px display:none"
-                                href="#calculation-install"
+                                href="#calculate-install"
                                 ><i
                                     class="height:20px fill:#505050"
                                     src="/assets/svg/link.svg"></i
@@ -167,26 +167,26 @@ <h2 class="padding:5px_0px">Install</h2>
                         </span>
                     </div>
 
-                    <pre><code class="language-bash">npm i @cocreate/calculation</code></pre>
+                    <pre><code class="language-bash">npm i @cocreate/calculate</code></pre>
                     <p class="padding:10px_0px line-height:1.5">
                         Or you can use cdn link:
                     </p>
-                    <pre><code class="language-html">&lt;script&gt;https://cdn.cocreate.app/calculation/latest/CoCreate-calculation.min.js&lt;/script&gt;</code></pre>
+                    <pre><code class="language-html">&lt;script&gt;https://cdn.cocreate.app/calculate/latest/CoCreate-calculate.min.js&lt;/script&gt;</code></pre>
 
                     <div
-                        id="calculation-usage"
+                        id="calculate-usage"
                         class="margin-top:80px border-bottom:1px_solid_lightgrey"
                         scroll
                         scroll-intersect="color:dodgerblue"
-                        scroll-selector="#calculation-usage-section">
+                        scroll-selector="#calculate-usage-section">
                         <span
                             class="display:flex align-items:center width:fit-content"
                             hover="display:block!important"
-                            hover-selector="[href='#calculation-usage']">
+                            hover-selector="[href='#calculate-usage']">
                             <h2 class="padding:5px_0px">Usage</h2>
                             <a
                                 class="margin-left:10px display:none"
-                                href="#calculation-usage"
+                                href="#calculate-usage"
                                 ><i
                                     class="height:20px fill:#505050"
                                     src="/assets/svg/link.svg"></i
@@ -195,34 +195,34 @@ <h2 class="padding:5px_0px">Usage</h2>
                     </div>
                     <div class="">
                         <p class="padding:10px_0px line-height:1.5">
-                            This is calculations usage
+                            This is calculate usage
                         </p>
 
                         <div class="flex-grow:1 min-width:300px width:100%">
                             <pre><code class="language-html">&lt;div&gt;&lt;/div&gt;</code></pre>
                         </div>
                         <p class="padding:10px_0px line-height:1.5">
-                            This is calculations usage
+                            This is calculate usage
                         </p>
                         <p class="padding:10px_0px line-height:1.5">
-                            This is calculations usage
+                            This is calculate usage
                         </p>
                     </div>
 
                     <div
-                        id="calculation-attributes"
+                        id="calculate-attributes"
                         class="margin-top:80px border-bottom:1px_solid_lightgrey"
                         scroll
                         scroll-intersect="color:dodgerblue"
-                        scroll-selector="#calculation-attributes-section">
+                        scroll-selector="#calculate-attributes-section">
                         <span
                             class="display:flex align-items:center width:fit-content"
                             hover="display:block!important"
-                            hover-selector="[href='#calculation-attributes']">
+                            hover-selector="[href='#calculate-attributes']">
                             <h2 class="padding:5px_0px">Attributes</h2>
                             <a
                                 class="margin-left:10px display:none"
-                                href="#calculation-attributes"
+                                href="#calculate-attributes"
                                 ><i
                                     class="height:20px fill:#505050"
                                     src="/assets/svg/link.svg"></i
@@ -241,7 +241,7 @@ <h4>
                                     >optional</span
                                 >
                             </h4>
-                            <p>calculations-attribute</p>
+                            <p>calculate-attribute</p>
                         </li>
                         <li
                             class="padding:15px_0px border-bottom:1px_solid_lightgrey">
@@ -254,7 +254,7 @@ <h4>
                                     >optional</span
                                 >
                             </h4>
-                            <p>calculations-attribute</p>
+                            <p>calculate-attribute</p>
                         </li>
                     </ul>
                 </div>
@@ -263,19 +263,19 @@ <h4>
                     class="flex-grow:1 width:300px padding:0px_10px margin-top:60px border-bottom:1px_solid_lightgrey">
                     <!-- SandBox -->
                     <div
-                        id="calculation-demo"
+                        id="calculate-demo"
                         class="border-bottom:1px_solid_lightgrey"
                         scroll
                         scroll-intersect="color:dodgerblue"
-                        scroll-selector="#calculation-demo-section">
+                        scroll-selector="#calculate-demo-section">
                         <span
                             class="display:flex align-items:center width:fit-content"
                             hover="display:block!important"
-                            hover-selector="[href='#calculation-demo']">
+                            hover-selector="[href='#calculate-demo']">
                             <h2 class="padding:5px_0px">Demo</h2>
                             <a
                                 class="margin-left:10px display:none"
-                                href="#calculation-demo"
+                                href="#calculate-demo"
                                 ><i
                                     class="height:20px fill:#505050"
                                     src="/assets/svg/link.svg"></i
@@ -367,7 +367,7 @@ <h2 class="padding:5px_0px">Demo</h2>
                 </div>
             </div>
             <button
-                href="https://github.com/CoCreate-app/CoCreate-calculation/tree/master/docs/index.html?message=docs%3A%20describe%20your%20change..."
+                href="https://github.com/CoCreate-app/CoCreate-calculate/tree/master/docs/index.html?message=docs%3A%20describe%20your%20change..."
                 target="_blank"
                 class="display:flex justify-content:center align-items:center position:fixed bottom:15px right:15px height:50px width:50px border-radius:50% box-shadow:0px_2px_10px_0px_rgba(0,_0,_0,_0.4)">
                 <i class="height:20px" src="../assets/svg/pencil-alt.svg"></i>
diff --git a/package.json b/package.json
index e348c5e..0b37af0 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "@cocreate/calculation",
+  "name": "@cocreate/calculate",
   "version": "1.14.0",
-  "description": "A handy vanilla JavaScript calculator, concatenate multiple elements containing integers & execute calculations. Can be used for creating  invoices,making payments & any kind of complex calculation. Easily configured using HTML5 attributes and/or JavaScript API.",
+  "description": "A handy vanilla JavaScript calculator, concatenate multiple elements containing integers & execute calculates. Can be used for creating  invoices,making payments & any kind of complex calculate. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
-    "calculation",
+    "calculate",
     "calculate-values",
     "calculate-total",
     "cocreate",
@@ -32,14 +32,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CoCreate-app/CoCreate-calculations.git"
+    "url": "git+https://github.com/CoCreate-app/CoCreate-calculate.git"
   },
   "author": "CoCreate LLC",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/CoCreate-app/CoCreate-calculations/issues"
+    "url": "https://github.com/CoCreate-app/CoCreate-calculate/issues"
   },
-  "homepage": "https://cocreate.app/docs/calculations",
+  "homepage": "https://cocreate.app/docs/calculate",
   "funding": {
     "type": "GitHub Sponsors ❤",
     "url": "https://github.com/sponsors/CoCreate-app"
diff --git a/src/index.js b/src/index.js
index b352ab7..a4c5071 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,8 +5,8 @@ import '@cocreate/element-prototype';
 
 
 function init() {
-    let calculationElements = document.querySelectorAll('[calculate]');
-    initElements(calculationElements);
+    let calculateElements = document.querySelectorAll('[calculate]');
+    initElements(calculateElements);
 }
 
 function initElements(elements) {
@@ -15,11 +15,11 @@ function initElements(elements) {
 }
 
 function initElement(element) {
-    let calculation = element.getAttribute('calculate');
-    if (calculation.includes('{{') || calculation.includes('{['))
+    let calculate = element.getAttribute('calculate');
+    if (calculate.includes('{{') || calculate.includes('{['))
         return;
 
-    let selectors = getSelectors(calculation);
+    let selectors = getSelectors(calculate);
 
     for (let i = 0; i < selectors.length; i++) {
         // if (selectors[i].includes('{{')) return;
@@ -31,7 +31,7 @@ function initElement(element) {
         }
 
         observer.init({
-            name: 'calculationSelectorInit',
+            name: 'calculateSelectorInit',
             observe: ['addedNodes'],
             target: selectors[i],
             callback(mutation) {
@@ -63,8 +63,8 @@ function getSelectors(string) {
     return selectors;
 }
 
-async function getValues(calculation) {
-    let selectors = getSelectors(calculation);
+async function getValues(calculate) {
+    let selectors = getSelectors(calculate);
 
     for (let i = 0; i < selectors.length; i++) {
         let selector = selectors[i];
@@ -83,11 +83,11 @@ async function getValues(calculation) {
         }
 
         if (value != null && !Number.isNaN(value)) {
-            calculation = calculation.replaceAll('{' + selector + '}', value);
+            calculate = calculate.replaceAll('{' + selector + '}', value);
         }
     }
 
-    return calculation;
+    return calculate;
 }
 
 function initEvent(element, input) {
@@ -105,9 +105,9 @@ function initEvent(element, input) {
 
 async function setCalcationResult(element) {
     const { object, isRealtime } = getAttributes(element);
-    let calculation = element.getAttribute('calculate');
+    let calculate = element.getAttribute('calculate');
 
-    let calString = await getValues(calculation);
+    let calString = await getValues(calculate);
 
     if (calString) {
         let result = calculate(calString);
@@ -147,7 +147,7 @@ function calculate(string) {
 }
 
 observer.init({
-    name: 'CoCreateCalculationChangeValue',
+    name: 'CoCreateCalculateChangeValue',
     observe: ['attributes'],
     attributeName: ['calculate'],
     callback(mutation) {
@@ -156,7 +156,7 @@ observer.init({
 });
 
 observer.init({
-    name: 'CoCreateCalculationInit',
+    name: 'CoCreateCalculateInit',
     observe: ['addedNodes'],
     target: '[calculate]',
     callback(mutation) {
diff --git a/webpack.config.js b/webpack.config.js
index 5a66794..7ac4968 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,14 +10,14 @@ module.exports = (env, argv) => {
 
     const config = {
         entry: {
-            "CoCreate-calculation": "./src/index.js",
+            "CoCreate-calculate": "./src/index.js",
         },
         output: {
             path: path.resolve(__dirname, "dist"),
             filename: isProduction ? "[name].min.js" : "[name].js",
             libraryTarget: "umd",
             libraryExport: "default",
-            library: ["CoCreate", "calculation"],
+            library: ["CoCreate", "calculate"],
             globalObject: "this",
         },