diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php
index 77bd49c..f574ec3 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php
@@ -234,7 +234,7 @@ abstract class AbstractClassnameChecker implements PhpCsSniff
 
         $phpcsFile->fixer->replaceToken(
             $classnamePosition,
-            $this->getTokenForReplacement($prefix . $this->getNewClassname($classname), $classname)
+            $this->getTokenForReplacement($prefix . $this->getNewClassname($classname), $classname, $phpcsFile)
         );
     }
 
@@ -244,9 +244,10 @@ abstract class AbstractClassnameChecker implements PhpCsSniff
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         return $newClassname;
     }
diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php
index 2a540bb..14efb72 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php
@@ -79,9 +79,10 @@ class Typo3Update_Sniffs_LegacyClassnames_DocCommentSniff extends AbstractClassn
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         $token = explode(' ', $this->originalTokenContent);
 
diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php
index 4740c0e..0877989 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php
@@ -83,13 +83,19 @@ class Typo3Update_Sniffs_LegacyClassnames_InlineCommentSniff extends AbstractCla
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         $token = preg_split('/\s+/', $this->originalTokenContent);
         $token[$this->getClassnamePosition($token)] = $newClassname;
 
+        // Keep line ending, removed by preg_split
+        if ($token[0] === '//') {
+            $token[count($token)] = $phpcsFile->eolChar;
+        }
+
         return implode(' ', $token);
     }
 }
diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php
index b25c613..bcb33d5 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php
@@ -75,9 +75,10 @@ class Typo3Update_Sniffs_LegacyClassnames_InstantiationWithMakeInstanceSniff ext
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         return $this->getTokenReplacementForString($newClassname);
     }
diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithObjectManagerSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithObjectManagerSniff.php
index 67014fe..0afe79c 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithObjectManagerSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithObjectManagerSniff.php
@@ -85,9 +85,10 @@ class Typo3Update_Sniffs_LegacyClassnames_InstantiationWithObjectManagerSniff ex
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         return $this->getTokenReplacementForString($newClassname);
     }
diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php
index 89bd2fa..3848adf 100644
--- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php
@@ -74,9 +74,10 @@ class Typo3Update_Sniffs_LegacyClassnames_IsACallSniff extends AbstractClassname
      *
      * @param string $newClassname
      * @param string $originalClassname
+     * @param PhpCsFile $phpcsFile
      * @return string
      */
-    protected function getTokenForReplacement($newClassname, $originalClassname)
+    protected function getTokenForReplacement($newClassname, $originalClassname, PhpCsFile $phpcsFile)
     {
         return $this->getTokenReplacementForString($newClassname);
     }
diff --git a/tests/Fixtures/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff/Expected.diff b/tests/Fixtures/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff/Expected.diff
index 09e3e30..6674872 100644
--- a/tests/Fixtures/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff/Expected.diff
+++ b/tests/Fixtures/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff/Expected.diff
@@ -1,6 +1,6 @@
 --- tests/Fixtures/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff/InputFileForIssues.php
 +++ PHP_CodeSniffer
-@@ -23,16 +23,14 @@
+@@ -23,16 +23,16 @@
  {
      public function something()
      {
@@ -21,4 +21,3 @@
          $variable;
      }
  }
-