diff --git a/FatPkg/EnhancedFatDxe/Fat.inf b/FatPkg/EnhancedFatDxe/Fat.inf
index 1c2b08fc08..d0ef23a640 100644
--- a/FatPkg/EnhancedFatDxe/Fat.inf
+++ b/FatPkg/EnhancedFatDxe/Fat.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Component description file for FAT module.
 #
 #  This UEFI driver detects the FAT file system in the disk.
 #  It also produces the Simple File System protocol for the consumer to
 #  perform file and directory operations on the disk.
-#  Copyright (c) 2007, Intel Corporation
+#  Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  This program and the accompanying materials are licensed and made available
 #  under the terms and conditions of the BSD License which accompanies this
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010005
@@ -39,7 +39,7 @@
 #  COMPONENT_NAME2               =  gFatComponentName2
 #
 
-[Sources.common]
+[Sources]
   DirectoryCache.c
   DiskCache.c
   FileName.c
diff --git a/FatPkg/FatPkg.dec b/FatPkg/FatPkg.dec
index 0e1d10f1f4..b4995aceec 100644
--- a/FatPkg/FatPkg.dec
+++ b/FatPkg/FatPkg.dec
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #
 #  FAT Package
 #
 # FAT 32 Driver
-#  Copyright (c) 2007,  Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  This program and the accompanying materials are licensed and made available
 #  under the terms and conditions of the BSD License which accompanies this
@@ -13,7 +13,7 @@
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##
 
 [Defines]
   DEC_VERSION                    = 0x00010005
diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
index 84b357f819..8913812df8 100644
--- a/FatPkg/FatPkg.dsc
+++ b/FatPkg/FatPkg.dsc
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #
 #  Build Binary Enhanced Fat Driver Modules
 #
 #  This Platform file is used to generate the Binary Fat Drivers
 #  for EDK II Prime release.
-#  Copyright (c) 2007, Intel Corporation
+#  Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  This program and the accompanying materials are licensed and made available
 #  under the terms and conditions of the BSD License which accompanies this
@@ -14,7 +14,7 @@
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##
 
 [Defines]
   PLATFORM_NAME                  = Fat
@@ -26,7 +26,7 @@
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
 
-[LibraryClasses.common]
+[LibraryClasses]
   #
   # Entry Point Libraries
   #
@@ -64,5 +64,5 @@
 #
 ###################################################################################################
 
-[Components.common]
+[Components]
   FatPkg/EnhancedFatDxe/Fat.inf