Improved heat transfer predictions on rough surfaces