some name changes