diff --git a/exercises/difference-of-squares/DifferenceOfSquares.cs b/exercises/difference-of-squares/DifferenceOfSquares.cs
index 2b6167cda1..66f75234f5 100644
--- a/exercises/difference-of-squares/DifferenceOfSquares.cs
+++ b/exercises/difference-of-squares/DifferenceOfSquares.cs
@@ -1,18 +1,18 @@
 using System;
 
-public static class Squares
+public static class DifferenceOfSquares
 {
-    public static int SquareOfSums(int max)
+    public static int CalculateSquareOfSum(int max)
     {
         throw new NotImplementedException("You need to implement this function.");
     }
 
-    public static int SumOfSquares(int max)
+    public static int CalculateSumOfSquares(int max)
     {
         throw new NotImplementedException("You need to implement this function.");
     }
 
-    public static int DifferenceOfSquares(int max)
+    public static int CalculateDifferenceOfSquares(int max)
     {
         throw new NotImplementedException("You need to implement this function.");
     }
diff --git a/exercises/difference-of-squares/DifferenceOfSquaresTest.cs b/exercises/difference-of-squares/DifferenceOfSquaresTest.cs
index 7f887c6516..8b5a040350 100644
--- a/exercises/difference-of-squares/DifferenceOfSquaresTest.cs
+++ b/exercises/difference-of-squares/DifferenceOfSquaresTest.cs
@@ -1,65 +1,60 @@
-using System;
+// This file was auto-generated based on version 1.1.0 of the canonical data.
+
 using Xunit;
 
-public class DifferenceOfSquaresTests
+public class DifferenceOfSquaresTest
 {
     [Fact]
-    public void Test_square_of_sums_to_5()
-    {
-        Assert.Equal(225, Squares.SquareOfSums(5));
-    }
-
-    [Fact(Skip = "Remove to run test")]
-    public void Test_sum_of_squares_to_5()
+    public void Square_of_sum_1()
     {
-        Assert.Equal(55, Squares.SumOfSquares(5));
+        Assert.Equal(1, DifferenceOfSquares.CalculateSquareOfSum(1));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_difference_of_sums_to_5()
+    public void Square_of_sum_5()
     {
-        Assert.Equal(170, Squares.DifferenceOfSquares(5));
+        Assert.Equal(225, DifferenceOfSquares.CalculateSquareOfSum(5));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_square_of_sums_to_10()
+    public void Square_of_sum_100()
     {
-        Assert.Equal(3025, Squares.SquareOfSums(10));
+        Assert.Equal(25502500, DifferenceOfSquares.CalculateSquareOfSum(100));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_sum_of_squares_to_10()
+    public void Sum_of_squares_1()
     {
-        Assert.Equal(385, Squares.SumOfSquares(10));
+        Assert.Equal(1, DifferenceOfSquares.CalculateSumOfSquares(1));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_difference_of_sums_to_10()
+    public void Sum_of_squares_5()
     {
-        Assert.Equal(2640, Squares.DifferenceOfSquares(10));
+        Assert.Equal(55, DifferenceOfSquares.CalculateSumOfSquares(5));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_square_of_sums_to_100()
+    public void Sum_of_squares_100()
     {
-        Assert.Equal(25502500, Squares.SquareOfSums(100));
+        Assert.Equal(338350, DifferenceOfSquares.CalculateSumOfSquares(100));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_sum_of_squares_to_100()
+    public void Difference_of_squares_1()
     {
-        Assert.Equal(338350, Squares.SumOfSquares(100));
+        Assert.Equal(0, DifferenceOfSquares.CalculateDifferenceOfSquares(1));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_difference_of_sums_to_100()
+    public void Difference_of_squares_5()
     {
-        Assert.Equal(25164150, Squares.DifferenceOfSquares(100));
+        Assert.Equal(170, DifferenceOfSquares.CalculateDifferenceOfSquares(5));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Test_difference_of_sums_0()
+    public void Difference_of_squares_100()
     {
-        Assert.Equal(0, Squares.DifferenceOfSquares(0));
+        Assert.Equal(25164150, DifferenceOfSquares.CalculateDifferenceOfSquares(100));
     }
-}
+}
\ No newline at end of file
diff --git a/exercises/difference-of-squares/Example.cs b/exercises/difference-of-squares/Example.cs
index a7d83e8baa..58b25d7e9c 100644
--- a/exercises/difference-of-squares/Example.cs
+++ b/exercises/difference-of-squares/Example.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Linq;
 
-public static class Squares
+public static class DifferenceOfSquares
 {
-    public static int SquareOfSums(int max)
+    public static int CalculateSquareOfSum(int max)
     {
         var numbers = Enumerable.Range(1, max);
         int sum = numbers.Sum();
         return sum * sum;
     }
 
-    public static int SumOfSquares(int max)
+    public static int CalculateSumOfSquares(int max)
     {
         var numbers = Enumerable.Range(1, max);
         return numbers.Select(x => x * x).Sum();
     }
 
-    public static int DifferenceOfSquares(int max)
+    public static int CalculateDifferenceOfSquares(int max)
     {
-        return SquareOfSums(max) - SumOfSquares(max);
+        return CalculateSquareOfSum(max) - CalculateSumOfSquares(max);
     }
 }
\ No newline at end of file
diff --git a/generators/Exercises/DifferenceOfSquares.cs b/generators/Exercises/DifferenceOfSquares.cs
new file mode 100644
index 0000000000..53682b5d74
--- /dev/null
+++ b/generators/Exercises/DifferenceOfSquares.cs
@@ -0,0 +1,25 @@
+using Generators.Input;
+using System;
+
+namespace Generators.Exercises
+{
+    public class DifferenceOfSquares : Exercise
+    {
+        protected override void UpdateCanonicalData(CanonicalData canonicalData)
+        {
+            foreach (var canonicalDataCase in canonicalData.Cases)
+                switch(canonicalDataCase.Property)
+                {
+                    case "squareOfSum":
+                        canonicalDataCase.Property = "CalculateSquareOfSum";
+                        break;
+                    case "sumOfSquares":
+                        canonicalDataCase.Property = "CalculateSumOfSquares";
+                        break;
+                    case "differenceOfSquares":
+                        canonicalDataCase.Property = "CalculateDifferenceOfSquares";
+                        break;
+                }
+        }
+    }
+}