switch to new naming convention for wireless