Fix for: BHV-10735

Update naming conventions.