Fixing naming problem