diff --git a/src/AST/Comment.cs b/src/AST/Comment.cs
index f6685c93..1ee01d95 100644
--- a/src/AST/Comment.cs
+++ b/src/AST/Comment.cs
@@ -10,10 +10,10 @@ namespace CppSharp.AST
     {
         // Invalid comment.
         Invalid,
-        // Any normal BCPL comments.
-        OrdinaryBCPL,
-        // Any normal C comment.
-        OrdinaryC,
+        // "// stuff"
+        BCPL,
+        // "/* stuff */"
+        C,
         // "/// stuff"
         BCPLSlash,
         // "//! stuff"
@@ -80,8 +80,8 @@ namespace CppSharp.AST
         {
             get
             {
-                return Kind == CommentKind.OrdinaryBCPL ||
-                       Kind == CommentKind.OrdinaryC;
+                return Kind == CommentKind.BCPL ||
+                       Kind == CommentKind.C;
             }
         }
 
@@ -131,10 +131,10 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.OrdinaryBCPL:
+            case CommentKind.BCPL:
             case CommentKind.BCPLExcl:
                 return "//";
-            case CommentKind.OrdinaryC:
+            case CommentKind.C:
             case CommentKind.JavaDoc:
             case CommentKind.Qt:
                 return " *";
@@ -149,10 +149,10 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.OrdinaryBCPL:
+            case CommentKind.BCPL:
             case CommentKind.BCPLSlash:
                 return string.Empty;
-            case CommentKind.OrdinaryC:
+            case CommentKind.C:
                 return "/*";
             case CommentKind.BCPLExcl:
                 return "//!";
@@ -169,11 +169,11 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.OrdinaryBCPL:
+            case CommentKind.BCPL:
             case CommentKind.BCPLSlash:
             case CommentKind.BCPLExcl:
                 return string.Empty;
-            case CommentKind.OrdinaryC:
+            case CommentKind.C:
             case CommentKind.JavaDoc:
             case CommentKind.Qt:
                 return " */";
diff --git a/src/Generator/Generators/CLI/CLIHeaders.cs b/src/Generator/Generators/CLI/CLIHeaders.cs
index 8320d5ca..a07d0b46 100644
--- a/src/Generator/Generators/CLI/CLIHeaders.cs
+++ b/src/Generator/Generators/CLI/CLIHeaders.cs
@@ -21,7 +21,7 @@ namespace CppSharp.Generators.CLI
 
         public override void Process()
         {
-            GenerateFilePreamble(CommentKind.OrdinaryBCPL);
+            GenerateFilePreamble(CommentKind.BCPL);
 
             PushBlock(CLIBlockKind.Includes);
             WriteLine("#pragma once");
diff --git a/src/Generator/Generators/CLI/CLISources.cs b/src/Generator/Generators/CLI/CLISources.cs
index 6578c455..7dcb0da9 100644
--- a/src/Generator/Generators/CLI/CLISources.cs
+++ b/src/Generator/Generators/CLI/CLISources.cs
@@ -24,7 +24,7 @@ namespace CppSharp.Generators.CLI
 
         public override void Process()
         {
-            GenerateFilePreamble(CommentKind.OrdinaryBCPL);
+            GenerateFilePreamble(CommentKind.BCPL);
 
             var file = Path.GetFileNameWithoutExtension(TranslationUnit.FileName)
                 .Replace('\\', '/');
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index 5b024a56..df896d73 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -144,7 +144,7 @@ namespace CppSharp.Generators.CSharp
 
         public override void Process()
         {
-            GenerateFilePreamble(CommentKind.OrdinaryBCPL);
+            GenerateFilePreamble(CommentKind.BCPL);
 
             GenerateUsings();
 
diff --git a/src/Parser/ASTConverter.cs b/src/Parser/ASTConverter.cs
index 775d8382..98970143 100644
--- a/src/Parser/ASTConverter.cs
+++ b/src/Parser/ASTConverter.cs
@@ -894,9 +894,9 @@ namespace CppSharp
                 case RawCommentKind.Invalid:
                     return AST.CommentKind.Invalid;
                 case RawCommentKind.OrdinaryBCPL:
-                    return AST.CommentKind.OrdinaryBCPL;
+                    return AST.CommentKind.BCPL;
                 case RawCommentKind.OrdinaryC:
-                    return AST.CommentKind.OrdinaryC;
+                    return AST.CommentKind.C;
                 case RawCommentKind.BCPLSlash:
                     return AST.CommentKind.BCPLSlash;
                 case RawCommentKind.BCPLExcl: