More renaming. Java method outlines for tree started.