Fixed unwanted name switching in logs