fixing naming stuff