Rename materials. Add infector. Minor fixes.