Change file name to fix travis (also some beautification)