More bobdenotter/bolt => bolt/bolt rename