Clean up bead naming
merge