Refactoring: classnames to java naming convention