* renamed some more vars