renames and plugin fix