rename and fix source-compatibility issues
2 files changed