Rename classes in an attempt to work on travis