fixed naming problems