fixed naming problem