Merge "Fix incorrect naming on context plugins"