adjust more names, updated travis configuration