Fixed naming conflicts; Changed deprecated move_iter() to into_iter()