Changed directly name so it's easier to create a package
Changed the menu caption