Fix rotation and add name