Update names and imports.