Fix naming issue