Merge "TIF: Add Hardware prefix to method/member names for better readability"