Merge changes I47b6011d,I5da28a6d into main

* changes:
  Rename timerfd functions for consistency
  Remove native prefix for consistency