renamed a few things to make travis happy