fixed naming issue