name refactoring
some name refactoring at the swing end