Fixed bad string concat
Fixed inconsistent name for uuids