honeybrid - refactor, correct port naming