Rename files to match assignment description
More fixes