Update plugins with renames of elements

Change-Id: I4e1f1346068e6d14df603c7b62db286e1cac52cf