Material name cleanup. Minor refactoring.

Change-Id: I2e0cba9267c61729eefe8bf0d3c29bf0892ba940
4 files changed