Update and rename of library to work with code