merge naming stuff