fixing naming issue