Cleaning up naming convention.
Updating b1 to b2