Additional renames and updates to comply with the new structure and naming.