Changed some names and fixed Travis-CI problem