rename classes and fix source for 1.6 compatibility
3 files changed