Replace plugin-name with plugin_slug & remove TODO