Fixed chunk naming bug and adjusted unit test to handle new names.