bb#11007 - fixed enumeration conflict, renamed all values