names of files and objects changed, way of invoking helper functions changed