Fixed names with special characters