Fix programs and rename files