diff --git a/bridge/nctalk/nctalk.go b/bridge/nctalk/nctalk.go
index 539f3fed..fb38b050 100644
--- a/bridge/nctalk/nctalk.go
+++ b/bridge/nctalk/nctalk.go
@@ -76,7 +76,7 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
 	if b.IsKeySet("GuestSuffix") {
 		guestSuffix = b.GetString("GuestSuffix")
 	}
-	userIdAsNick := b.GetBool("UserIdAsNick")
+	userIDAsNick := b.GetBool("UserIdAsNick")
 
 	go func() {
 		for msg := range c {
@@ -89,7 +89,7 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
 			remoteMessage := config.Message{
 				Text:     formatRichObjectString(msg.Message, msg.MessageParameters),
 				Channel:  newRoom.room.Token,
-				Username: DisplayName(msg, guestSuffix, userIdAsNick),
+				Username: DisplayName(msg, guestSuffix, userIDAsNick),
 				UserID:   msg.ActorID,
 				Account:  b.Account,
 			}
@@ -153,7 +153,7 @@ func formatRichObjectString(message string, parameters map[string]ocs.RichObject
 	return message
 }
 
-func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIdAsName bool) string {
+func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIDAsName bool) string {
 	if msg.ActorType == ocs.ActorGuest {
 		if msg.ActorDisplayName == "" {
 			return "Guest"
@@ -162,7 +162,7 @@ func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIdAsName bool)
 		return msg.ActorDisplayName + suffix
 	}
 	// Use the user ID instead of the display name for non-guest users
-	if userIdAsName {
+	if userIDAsName {
 		return msg.ActorID
 	}
 	return msg.ActorDisplayName