diff --git a/com.reprezen.swagedit.core/plugin.xml b/com.reprezen.swagedit.core/plugin.xml
index 93e84152..8aecf00f 100644
--- a/com.reprezen.swagedit.core/plugin.xml
+++ b/com.reprezen.swagedit.core/plugin.xml
@@ -31,9 +31,9 @@
    <extension
          point="org.eclipse.ui.contexts">
       <context
-            description="Context for SwagEdit"
+            description="Context for KaiZen Editor"
             id="com.reprezen.swagedit.context"
-            name="SwagEdit"
+            name="KaiZen Editor"
             parentId="org.eclipse.ui.textEditorScope">
       </context>
    </extension>
diff --git a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonEditor.java b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonEditor.java
index 472497a9..3325cc16 100755
--- a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonEditor.java
+++ b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonEditor.java
@@ -415,7 +415,7 @@ protected void validate() {
     }
 
     protected void runValidate(final boolean onOpen) {
-        new SafeWorkspaceJob("Update SwagEdit validation markers") {
+        new SafeWorkspaceJob("Update KaiZen Editor validation markers") {
 
             @Override
             public IStatus doRunInWorkspace(IProgressMonitor monitor) throws CoreException {
diff --git a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonScanner.java b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonScanner.java
index 078d1414..1f9aeef6 100644
--- a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonScanner.java
+++ b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/editor/JsonScanner.java
@@ -41,7 +41,7 @@
 
 /*
  * Identical implementation of a BufferedRuleBasedScanner than YAMLScanner but makes 
- * use of SwagEdit PreferenceStore to set SwagEdit colors instead of YEdit colors.
+ * use of KaiZen Editor PreferenceStore to set KaiZen Editor colors instead of YEdit colors.
  * 
  * This implementation is necessary due to the lack of possibility to override YAMLScanner
  * usage of a preference store.
diff --git a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/json/references/messages.properties b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/json/references/messages.properties
index cbd7a629..898367a9 100644
--- a/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/json/references/messages.properties
+++ b/com.reprezen.swagedit.core/src/com/reprezen/swagedit/core/json/references/messages.properties
@@ -9,7 +9,7 @@
 #    ModelSolv, Inc. - initial API and implementation and/or initial documentation
 ###############################################################################
 
-error_missing_reference= Invalid Reference - KaiZen Editor was unable to resolve the reference. \n\
+error_missing_reference= Invalid Reference - Unable to resolve the reference. \n\
 The value must be a valid JSON Reference (for external references) or JSON Pointer (for local references), and must resolve to an object of the expected type.
 error_invalid_reference= Invalid Reference Syntax - The referenced path or URI may contain invalid characters.  \n\
 The value must be a valid JSON Reference (for external references) or JSON Pointer (for local references), and must resolve to an object of the expected type.
diff --git a/com.reprezen.swagedit.openapi3.tests/META-INF/MANIFEST.MF b/com.reprezen.swagedit.openapi3.tests/META-INF/MANIFEST.MF
index 82b81fbd..1076361f 100644
--- a/com.reprezen.swagedit.openapi3.tests/META-INF/MANIFEST.MF
+++ b/com.reprezen.swagedit.openapi3.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SwagEdit Tests
+Bundle-Name: KaiZen Editor Tests
 Bundle-SymbolicName: com.reprezen.swagedit.openapi3.tests
 Bundle-Version: 0.8.0.qualifier
 Fragment-Host: com.reprezen.swagedit.openapi3;bundle-version="0.8.0"
diff --git a/com.reprezen.swagedit.openapi3/plugin.xml b/com.reprezen.swagedit.openapi3/plugin.xml
index 818efb6d..ca3d41a3 100644
--- a/com.reprezen.swagedit.openapi3/plugin.xml
+++ b/com.reprezen.swagedit.openapi3/plugin.xml
@@ -72,7 +72,7 @@
          point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
       <target
             id="com.reprezen.swagedit.openapi3.hyperlink.target"
-            name="SwagEdit OpenAPI v3">
+            name="KaiZen Editor OpenAPI v3">
             <context type="org.eclipse.ui.texteditor.ITextEditor"/>
       </target>
    </extension>
diff --git a/com.reprezen.swagedit.openapi3/src/com/reprezen/swagedit/openapi3/editor/wizard/NewOpenApiV3SpecWizard.java b/com.reprezen.swagedit.openapi3/src/com/reprezen/swagedit/openapi3/editor/wizard/NewOpenApiV3SpecWizard.java
index 75f5417e..a77c236d 100644
--- a/com.reprezen.swagedit.openapi3/src/com/reprezen/swagedit/openapi3/editor/wizard/NewOpenApiV3SpecWizard.java
+++ b/com.reprezen.swagedit.openapi3/src/com/reprezen/swagedit/openapi3/editor/wizard/NewOpenApiV3SpecWizard.java
@@ -39,7 +39,7 @@ public NewOpenApiV3SpecWizardPage(IStructuredSelection selection) {
             super("SwagEditNewWizardPage", selection);
             setTitle("OpenAPI v3 Spec");
             setDescription(
-                    "This wizard creates a new OpenAPI v3 Spec in YAML format, which can be opened in SwagEdit.");
+                    "This wizard creates a new OpenAPI v3 Spec in YAML format, which can be opened in KaiZen Editor.");
             setImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/openAPI_64.png"));
             setFileExtension(extension);
         }
diff --git a/com.reprezen.swagedit.repository/category.xml b/com.reprezen.swagedit.repository/category.xml
index 53ea9a87..1b1366c4 100644
--- a/com.reprezen.swagedit.repository/category.xml
+++ b/com.reprezen.swagedit.repository/category.xml
@@ -3,5 +3,5 @@
    <feature url="features/com.reprezen.swagedit.feature_0.8.0.qualifier.jar" id="com.reprezen.swagedit.feature" version="0.8.0.qualifier">
       <category name="com.reprezen.swagedit"/>
    </feature>
-   <category-def name="com.reprezen.swagedit" label="SwagEdit"/>
+   <category-def name="com.reprezen.swagedit" label="KaiZen Editor"/>
 </site>
diff --git a/com.reprezen.swagedit.tests/META-INF/MANIFEST.MF b/com.reprezen.swagedit.tests/META-INF/MANIFEST.MF
index 28e6a104..e49e0c4b 100644
--- a/com.reprezen.swagedit.tests/META-INF/MANIFEST.MF
+++ b/com.reprezen.swagedit.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SwagEdit Tests
+Bundle-Name: KaiZen Editor Tests
 Bundle-SymbolicName: com.reprezen.swagedit.tests
 Bundle-Version: 0.8.0.qualifier
 Fragment-Host: com.reprezen.swagedit;bundle-version="0.8.0"
diff --git a/com.reprezen.swagedit/plugin.xml b/com.reprezen.swagedit/plugin.xml
index 4eb2e87d..c8d7a5d4 100644
--- a/com.reprezen.swagedit/plugin.xml
+++ b/com.reprezen.swagedit/plugin.xml
@@ -143,7 +143,7 @@
    <extension point="com.github.eclipsecolortheme.mapper">
        <mapper
            class="com.github.eclipsecolortheme.mapper.GenericMapper"
-           name="SwagEdit"
+           name="KaiZen Editor"
            pluginId="com.reprezen.swagedit"
            xml="resources/com.reprezen.swagedit.xml"/>
     </extension>
@@ -152,7 +152,7 @@
          point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
       <target
             id="com.reprezen.swagedit.hyperlink.target"
-            name="SwagEdit">
+            name="KaiZen Editor">
             <context type="org.eclipse.ui.texteditor.ITextEditor"/>
       </target>
    </extension>
@@ -184,14 +184,14 @@
    
    <extension
          point="org.eclipse.ui.themes">
-        <themeElementCategory label="SwagEdit" id="com.reprezen.swagedit.editor.presentation"/>
+        <themeElementCategory label="KaiZen Editor" id="com.reprezen.swagedit.editor.presentation"/>
         <fontDefinition
               categoryId="com.reprezen.swagedit.editor.presentation"
               defaultsTo="org.eclipse.jface.textfont"
               id="com.reprezen.swagedit.editor.textfont"
-              label="SwagEdit Text Font">
+              label="KaiZen Editor Text Font">
          <description>
-            This font is used by Swagger editor.
+            This font is used by KaiZen Editor.
          </description>
         </fontDefinition>
    </extension>
diff --git a/com.reprezen.swagedit/src/com/reprezen/swagedit/messages.properties b/com.reprezen.swagedit/src/com/reprezen/swagedit/messages.properties
index 0cf0a4f8..c04a17db 100644
--- a/com.reprezen.swagedit/src/com/reprezen/swagedit/messages.properties
+++ b/com.reprezen.swagedit/src/com/reprezen/swagedit/messages.properties
@@ -22,7 +22,7 @@ error_additional_properties_not_allowed = object has properties %s which are not
 error_required_properties = object has missing required properties %s
 error_duplicate_keys = Duplicate key: the object has more than one property named %s
 error_cannot_read_content = Unable to read content. It may be invalid YAML
-error_missing_reference= Invalid Reference - KaiZen Editor was unable to resolve the reference. \n\
+error_missing_reference= Invalid Reference - Unable to resolve the reference. \n\
 The value must be a valid JSON Reference (for external references) or JSON Pointer (for local references), and must resolve to an object of the expected type.
 error_invalid_reference= Invalid Reference Syntax - The referenced path or URI may contain invalid characters.  \n\
 The value must be a valid JSON Reference (for external references) or JSON Pointer (for local references), and must resolve to an object of the expected type.