Update the naming of the libraries/utils