Changed function naming to fhr.<..>
Updated comments about sourcing