Fixing class naming which was breaking Travis builds