rename and fix stacked