Rename files; improve comments
Fix a malformed comment