Fix naming problem