Nuu, use MAH name... also update those aliases