Merge "Rename contexts of ffs props"