[FOLD] Address reviews re: naming