Small renaming and prevent menu from showing up on right click