Clean up bead naming