naming issue fix