diff --git a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
index 4903e35cca..f1ad593d04 100644
--- a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
@@ -6,9 +6,10 @@
 /*! \brief Creates a new PhysicalPartition object.
 */
 PhysicalPartition::PhysicalPartition(uint16 number, uint32 start, uint32 length)
-	: fNumber(number)
-	, fStart(start)
-	, fLength(length)
+	:
+	fNumber(number),
+	fStart(start),
+	fLength(length)
 {
 }
 
@@ -26,13 +27,14 @@ PhysicalPartition::~PhysicalPartition()
 status_t
 PhysicalPartition::MapBlock(uint32 logicalBlock, off_t &physicalBlock)
 {
-	DEBUG_INIT_ETC("PhysicalPartition", ("%ld", logicalBlock));
+	TRACE(("PhysicalPartition::MapBlock: %ld", logicalBlock));
 	if (logicalBlock >= fLength) {
-		PRINT(("invalid logical block: %ld, length: %ld\n", logicalBlock, fLength));
+		TRACE_ERROR(("invalid logical block: %ld, length: %ld\n",
+			logicalBlock, fLength));
 		return B_BAD_ADDRESS;
 	} else {
 		physicalBlock = fStart + logicalBlock;
-		PRINT(("mapped %ld to %Ld\n", logicalBlock, physicalBlock));
+		TRACE(("mapped %ld to %Ld\n", logicalBlock, physicalBlock));
 		return B_OK;
 	}
 }
diff --git a/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp b/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp
index 27350230b7..3997a40247 100644
--- a/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp
+++ b/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp
@@ -30,10 +30,10 @@ const charspec kCs0CharacterSet(0, "OSTA Compressed Unicode");
 //                              };
                               
 // Volume structure descriptor ids 
-const char* kVSDID_BEA 		= "BEA01";
-const char* kVSDID_TEA 		= "TEA01";
+const char* kVSDID_BEA 			= "BEA01";
+const char* kVSDID_TEA 			= "TEA01";
 const char* kVSDID_BOOT 		= "BOOT2";
-const char* kVSDID_ISO 		= "CD001";
+const char* kVSDID_ISO 			= "CD001";
 const char* kVSDID_ECMA167_2 	= "NSR02";
 const char* kVSDID_ECMA167_3 	= "NSR03";
 const char* kVSDID_ECMA168		= "CDW02";
diff --git a/src/add-ons/kernel/file_systems/udf/Utils.cpp b/src/add-ons/kernel/file_systems/udf/Utils.cpp
index c9344ea1f1..4fc04cfe0f 100644
--- a/src/add-ons/kernel/file_systems/udf/Utils.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Utils.cpp
@@ -154,9 +154,9 @@ to_vnode_id(long_address address)
 	ino_t result = address.block();
 	result <<= 16;
 	result |= address.partition();
-	PRINT(("block:     %ld, 0x%lx\n", address.block(), address.block())); 
-	PRINT(("partition: %d, 0x%x\n", address.partition(), address.partition())); 
-	PRINT(("length:    %ld, 0x%lx\n", address.length(), address.length()));
-	PRINT(("ino_t:     %Ld, 0x%Lx\n", result, result));
+	TRACE(("block:     %ld, 0x%lx\n", address.block(), address.block())); 
+	TRACE(("partition: %d, 0x%x\n", address.partition(), address.partition())); 
+	TRACE(("length:    %ld, 0x%lx\n", address.length(), address.length()));
+	TRACE(("ino_t:     %Ld, 0x%Lx\n", result, result));
 	return result;
 }