Some renamings and cleanups.