few translations and minor name changes