Improve naming for consistency
Remove last vestiges of Bacon