First round of changes to accommdate plugin name change