Merge pull request #3454 from mozilla/branding-cleanup

Branding cleanup

BIBLIOGRAPHY.md

@@ -1,5 +1,5 @@
 This file contains a list of papers in chronological order that have been published 
-using Mozilla's DeepSpeech.
+using DeepSpeech.
 
 To appear
 ==========

doc/TRAINING.rst

@@ -247,7 +247,7 @@ N.B. - If you have access to a pre-trained model which uses UTF-8 bytes at the o
 Fine-Tuning (same alphabet)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you'd like to use one of the pre-trained models released by Mozilla to bootstrap your training process (fine tuning), you can do so by using the ``--checkpoint_dir`` flag in ``DeepSpeech.py``. Specify the path where you downloaded the checkpoint from the release, and training will resume from the pre-trained model.
+If you'd like to use one of the pre-trained models to bootstrap your training process (fine tuning), you can do so by using the ``--checkpoint_dir`` flag in ``DeepSpeech.py``. Specify the path where you downloaded the checkpoint from the release, and training will resume from the pre-trained model.
 
 For example, if you want to fine tune the entire graph using your own data in ``my-train.csv``\ , ``my-dev.csv`` and ``my-test.csv``\ , for three epochs, you can something like the following, tuning the hyperparameters as needed:
 

doc/conf.py

@@ -46,8 +46,8 @@
 # -- Project information -----------------------------------------------------
 
 project = u'DeepSpeech'
-copyright = '2019-2020, Mozilla Corporation'
-author = 'Mozilla Corporation'
+copyright = '2019-2020 Mozilla Corporation, 2020 DeepSpeech authors'
+author = 'DeepSpeech authors'
 
 with open('../VERSION', 'r') as ver:
     v = ver.read().strip()
@@ -175,7 +175,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'DeepSpeech.tex', u'DeepSpeech Documentation',
-     u'Mozilla Research', 'manual'),
+     u'DeepSpeech authors', 'manual'),
 ]
 
 

native_client/dotnet/DeepSpeechClient/Interfaces/IDeepSpeech.cs

@@ -5,7 +5,7 @@
 namespace DeepSpeechClient.Interfaces
 {
     /// <summary>
-    /// Client interface of Mozilla's DeepSpeech implementation.
+    /// Client interface for DeepSpeech
     /// </summary>
     public interface IDeepSpeech : IDisposable
     {

native_client/dotnet/README.rst

@@ -61,7 +61,7 @@ There should already be a symbolic link, for this example let's suppose that we
    ├── D:\
    │   ├── cloned                 # Contains DeepSpeech and tensorflow side by side
    │   │   └── DeepSpeech         # Root of the cloned DeepSpeech
-   │   │       ├── tensorflow     # Root of the cloned Mozilla's tensorflow 
+   │   │       ├── tensorflow     # Root of the cloned mozilla/tensorflow 
    └── ...
 
 

native_client/dotnet/nupkg/deepspeech.nuspec.in

@@ -4,13 +4,13 @@
     <id>$NUPKG_ID</id>
     <version>$NUPKG_VERSION</version>
     <title>DeepSpeech</title>
-    <authors>Mozilla</authors>
-    <owners>Mozilla</owners>
+    <authors>DeepSpeech authors</authors>
+    <owners>DeepSpeech authors</owners>
     <license type="expression">MPL-2.0</license>
     <projectUrl>http://github.com/mozilla/DeepSpeech</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A library for running inference with a DeepSpeech model</description>
-    <copyright>Copyright (c) 2019 Mozilla Corporation</copyright>
+    <copyright>Copyright (c) 2019-2020 Mozilla Corporation, 2020 DeepSpeech authors</copyright>
     <tags>native speech speech_recognition</tags>
   </metadata>
   <files>

native_client/java/Makefile

@@ -28,4 +28,4 @@ maven-bundle: apk
 	$(GRADLE) zipMavenArtifacts
 
 bindings: clean ds-swig
-	$(DS_SWIG_ENV) swig -c++ -java -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+	$(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i

native_client/java/app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 27
 
     defaultConfig {
-        applicationId "org.mozilla.deepspeech"
+        applicationId "org.deepspeech"
         minSdkVersion 21
         targetSdkVersion 27
         versionName androidGitVersion.name()

native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech", appContext.getPackageName());
+        assertEquals("org.deepspeech", appContext.getPackageName());
     }
 }

native_client/java/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech">
+    package="org.deepspeech">
 
     <application
         android:allowBackup="true"

native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -16,7 +16,7 @@
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
 
 public class DeepSpeechActivity extends AppCompatActivity {
 

native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import org.junit.Test;
 

native_client/java/libdeepspeech/build.gradle

@@ -46,7 +46,7 @@ android {
 
     // Avoid scanning libdeepspeech_doc
     sourceSets {
-        main.java.srcDirs = [ 'src/main/java/org/mozilla/deepspeech/libdeepspeech/' ]
+        main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
     }
 }
 
@@ -77,7 +77,7 @@ uploadArchives {
         mavenDeployer {
             pom.packaging  = 'aar'
             pom.name       = 'libdeepspeech'
-            pom.groupId    = 'org.mozilla.deepspeech'
+            pom.groupId    = 'org.deepspeech'
             pom.artifactId = 'libdeepspeech'
             pom.version    = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
 
@@ -96,7 +96,7 @@ uploadArchives {
                 developers {
                     developer {
                         id 'deepspeech'
-                        name 'Mozilla DeepSpeech Team'
+                        name 'DeepSpeech authors'
                         email '[email protected]'
                     }
                 }

native_client/java/libdeepspeech/src/androidTest/java/org/mozilla/deepspeech/libdeepspeech/test/BasicTest.java → native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech.test;
+package org.deepspeech.libdeepspeech.test;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -11,8 +11,8 @@
 
 import static org.junit.Assert.*;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
-import org.mozilla.deepspeech.libdeepspeech.CandidateTranscript;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.CandidateTranscript;
 
 import java.io.RandomAccessFile;
 import java.io.FileNotFoundException;
@@ -54,7 +54,7 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech.libdeepspeech.test", appContext.getPackageName());
+        assertEquals("org.deepspeech.libdeepspeech.test", appContext.getPackageName());
     }
 
     @Test

native_client/java/libdeepspeech/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech.libdeepspeech" />
+    package="org.deepspeech.libdeepspeech" />

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechModel.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * @brief Exposes a DeepSpeech model in Java

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechStreamingState.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public final class DeepSpeechStreamingState {
     private SWIGTYPE_p_StreamingState _sp;

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/CandidateTranscript.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * A single transcript computed by the model, including a confidence<br>

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public enum DeepSpeech_Error_Codes {
   ERR_OK(0x0000),

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/Metadata.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * An array of CandidateTranscript objects computed by the model.

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/README.rst → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst

@@ -8,4 +8,4 @@ To update, please install SWIG (4.0 at least) and then run from native_client/ja
 
 .. code-block::
 
-   swig -c++ -java -doxygen -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+   swig -c++ -java -doxygen -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i

native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/TokenMetadata.java → native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * Stores text of an individual token, along with its timing information

native_client/java/libdeepspeech/src/test/java/org/mozilla/deepspeech/libdeepspeech/ExampleUnitTest.java → native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 import org.junit.Test;
 

native_client/javascript/package.json.in

@@ -7,7 +7,7 @@
     "bin": {
        "deepspeech": "./client.js"
     },
-    "author" : "Mozilla",
+    "author" : "DeepSpeech authors",
     "license": "MPL-2.0",
     "homepage": "https://github.com/mozilla/DeepSpeech/tree/v$(PROJECT_VERSION)#project-deepspeech",
     "files": [

native_client/swift/deepspeech-ios.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.summary      = "DeepSpeech"
   s.homepage     = "https://github.com/mozilla/DeepSpeech"
   s.license      = "Mozilla Public License 2.0"
-  s.authors      = "Mozilla et al."
+  s.authors      = "DeepSpeech authors"
 
   s.platforms    = { :ios => "9.0" }
   s.source       = { :git => "https://github.com/mozilla/DeepSpeech.git", :tag => "v#{s.version}" }

native_client/swift/deepspeech_ios.xcodeproj/project.pbxproj

@@ -395,7 +395,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios";
 				OTHER_LDFLAGS = "-lstdc++";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -434,7 +434,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios";
 				OTHER_LDFLAGS = "-lstdc++";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -454,7 +454,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-iosTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-iosTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -472,7 +472,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-iosTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-iosTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

native_client/swift/deepspeech_ios_test.xcodeproj/project.pbxproj

@@ -486,7 +486,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-test";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -511,7 +511,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-test";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -531,7 +531,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -552,7 +552,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -571,7 +571,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testUITests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -590,7 +590,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testUITests";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

setup.py

@@ -98,9 +98,9 @@ def main():
     setup(
         name='deepspeech_training',
         version=version,
-        description='Training code for mozilla DeepSpeech',
+        description='Training code for DeepSpeech',
         url='https://github.com/mozilla/DeepSpeech',
-        author='Mozilla',
+        author='DeepSpeech authors',
         license='MPL-2.0',
         # Classifiers help users find your project by categorizing it.
         #