Adjust more names, updated travis configuration