Merge "woods: correct device naming"