Using the same filenames as in the old version.
Removing bfgeom a now deprecated bool.