Partial fix to name rendering