Changed ReferenceSet internal variable names to follow coding style, and added FAI