fix java 8 issue and rename classnames