Fixing naming issue