1. Various updates and renames