bsp renaming and addressing Gedares notes