Rename in light of library inclusion