Fixed partial naming issue