Audit: Final renamings and cleanup