Some updates and renames