Made matter creation and some rename refactorings.