rename/label some stuff and fix test