Fixes issue #1.

Cleans up old references to the bs- namespace.
Merge branch 'fix-issue-1'