pull in naming fixes and critical hal bug fix