More javadoc changes and renamed annotation property