[Mix] names fixes