replaced bs- to bsf- in core and templates and tests