bhkCMSD name cleanup

Made some names more clear