Fixing naming issues