make function and constant naming clearer (code review feedback)
make function and constant naming clearer (code review feedback)

bgould/avian,MaartenR/avian,dicej/avian,bigfatbrowncat/avian-pack.avian,minor-jason/avian,lostdj/avian,minor-jason/avian,joshuawarner32/avian,marcinolawski/avian,MaartenR/avian,ucdseniordesign/avian,dicej/avian,lwahlmeier/avian,ucdseniordesign/avian,joshuawarner32/avian,marcinolawski/avian,minor-jason/avian,bigfatbrowncat/avian-pack.avian,lostdj/avian,MaartenR/avian,lwahlmeier/avian,ucdseniordesign/avian,bigfatbrowncat/avian-pack.avian,lostdj/avian,bgould/avian,joshuawarner32/avian,joshuawarner32/avian,marcinolawski/avian,lostdj/avian,lwahlmeier/avian,bgould/avian,bgould/avian,ucdseniordesign/avian,dicej/avian,minor-jason/avian,dicej/avian,lwahlmeier/avian,bigfatbrowncat/avian-pack.avian,marcinolawski/avian,MaartenR/avian