changed OSHW-M and OSHW-S to tNames layer (untested\!)