a few name changes