Small renames.