Bug fixes for different name logging