[UPDATE] Fix naming issue