Fixed naming problem