diff --git a/static/languages/_groups.json b/static/languages/_groups.json
index 4607ee4d1..f36abc7b8 100644
--- a/static/languages/_groups.json
+++ b/static/languages/_groups.json
@@ -156,7 +156,7 @@
     "languages": [
       "code_python",
       "code_c",
-      "code_csharp",
+      "code_c#",
       "code_c++",
       "code_javascript",
       "code_javascript_1k",
diff --git a/static/languages/_list.json b/static/languages/_list.json
index 304e7c304..aec20ed7e 100644
--- a/static/languages/_list.json
+++ b/static/languages/_list.json
@@ -83,7 +83,7 @@
   ,"pig_latin"
   ,"code_python"
   ,"code_c"
-  ,"code_csharp"
+  ,"code_c#"
   ,"code_c++"
   ,"code_javascript"
   ,"code_javascript_1k"
diff --git a/static/languages/code_csharp.json b/static/languages/code_c#.json
similarity index 100%
rename from static/languages/code_csharp.json
rename to static/languages/code_c#.json
diff --git a/static/quotes/code_java.json b/static/quotes/code_java.json
new file mode 100644
index 000000000..ce6f9db32
--- /dev/null
+++ b/static/quotes/code_java.json
@@ -0,0 +1,17 @@
+{
+  "language": "code_java",
+  "groups": [
+    [0, 100],
+    [101, 300],
+    [301, 600],
+    [601, 9999]
+  ],
+  "quotes": [
+    {
+      "text": "public class Main {\\npublic static void main(String[] args) {\\n\\tSystem.out.println(\"Hello World\");\\n\\t}\\n}",
+      "source": "W3Schools - Java Getting Started",
+      "id": 1,
+      "length": 87
+    }
+  ]
+}