Tweaked names in returned by CBF loader