adapted to new BAMBU naming convention