More Renaming, updated Javadocs