fixed the naming issue