Merge "Material name cleanup. Minor refactoring." into graphics-dev