fix device name for different language & extract the method