Renaming to align with plugin classes