Got the plugin ready for name change to UUID