changed fileinput and shortform names