fix device name for different language & extract the method
merge changes
move string method to map class, fix variable names