Name changes and updates to code samples