Got rid of 'S' in plugin internal names