Modified device labels to fit in with "Standard" config file