Fixed some Javadocs and finished renaming.