Moving away from bear naming convention.