Rename libraries per discussion with Obi