Rename and creating more plugins