Minor edits to names, as well as missing libs