WCM-77 Revert WCM-77 Use package name as plugin name