diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc
index a712a427..a0e43298 100644
--- a/src/gs-entbase/shared/ambient_generic.qc
+++ b/src/gs-entbase/shared/ambient_generic.qc
@@ -273,8 +273,7 @@ ambient_generic::Respawn(void)
 void
 ambient_generic::UseNormal(entity act, triggermode_t state)
 {
-	NSLog("Sound once: %S Volume: %f; Radius: %d; Pitch: %d", \
-		m_strActivePath, m_flVolume, m_flRadius, m_flPitch);
+	SndLog( "^2%s::^3UseNormal^7: %S Volume: %f; Radius: %d; Pitch: %f", classname, m_strActivePath, m_flVolume, m_flRadius, m_flPitch);
 
 	if (substring(m_strActivePath, 0, 1) == "!") {
 		string seq = Sentences_GetSamples(m_strActivePath);
@@ -301,13 +300,11 @@ void
 ambient_generic::UseLoop(entity act, triggermode_t state)
 {
 	if (m_bToggle == true) {
-		NSLog("^2ambient_generic::^3UseLoop^7: %s stops `%s`", 
-			target, m_strActivePath);
+		SndLog( "^2%s::^3UseLoop^7: %s stops %S", classname, target, m_strActivePath);
 		m_strActivePath = "common/null.wav";
 	} else {
 		m_strActivePath = m_strSpawnPath;
-		NSLog("^2ambient_generic::^3UseLoop^7: %s plays `%s`", 
-			target, m_strActivePath);
+		SndLog( "^2%s::^3UseLoop^7: %s plays %S", classname, target, m_strActivePath);
 	}
 
 	m_bToggle = !m_bToggle;
@@ -424,7 +421,7 @@ ambient_generic::ReceiveEntity(float isnew, float flChanged)
 	if (flChanged & AMBIENT_ENABLED)
 		m_bLoops = readbyte();
 
-	SndLog("Sound received: %S Volume: %f; Radius: %d; Pitch: %d, Org: %v", m_strActivePath, m_flVolume, m_flRadius, m_flPitch, origin);
+	SndLog( "^2%s::^3ReceiveEntity^7: received: %S Volume: %f; Radius: %d; Pitch: %d, Org: %v", classname, m_strActivePath, m_flVolume, m_flRadius, m_flPitch, origin);
 
 	if (m_bLoops == true) {
 		if (flChanged & AMBIENT_MODERN) {
diff --git a/src/shared/sound.qc b/src/shared/sound.qc
index 3fbd0053..e989fc74 100644
--- a/src/shared/sound.qc
+++ b/src/shared/sound.qc
@@ -328,7 +328,7 @@ Sound_PrecacheFile(string fileName)
 		g_hashsounds = hash_createtab(2, HASH_ADD);
 	}
 
-	print(sprintf("Precaching SOURCE ENGINE file %S\n", fileName));
+	SndLog("Precaching SOURCE ENGINE file %S", fileName);
 
 	while ((lineStream = fgets(scriptFile))) {
 		/* when we found it, quit */
@@ -396,9 +396,7 @@ Sound_Precache(string shader)
 
 	index = g_sounds_count;
 
-	SndLog("Precaching SoundDef ");
-	SndLog(shader);
-	SndLog("\n");
+	SndLog("Precaching SoundDef %S", shader);
 
 	/* create the hash-table if it doesn't exist */
 	if (!g_hashsounds) {