Corrected some library/schemantic inconsistencies due to device
renaming;
Renamed and numbered all devices in order of placement using the library
prefix