Updated library naming scheme a bit.