Fix old names and imports