Renamed files, changed constants to 'lets' to avoid warnings