updated FSDatabase to new nomenclature