Fixing naming adding changes