renamed some stuffs
Merge branch 'master' of https://github.com/mehikmat/java-stuffs