fixing naming problem