Reverted changes to device server names in an attempt to resolve issues related to SKB-100; renamed source files.