fix name stuff