diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/audit/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/audit/package-info.java
index 16c224940dd03..a69d422929426 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/audit/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/audit/package-info.java
@@ -19,11 +19,11 @@
 /**
  * Public classes for adding information to any auditing information
  * picked up by filesystem clients.
- *
  */
-@InterfaceAudience.Public
-@InterfaceStability.Unstable
+
+@Public
+@Unstable
 package org.apache.hadoop.fs.audit;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/package-info.java
index f1cd76c8f8c83..5d1b86a0c07b9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/package-info.java
@@ -41,9 +41,9 @@
  * are highly unstable.
  */
 
-@InterfaceAudience.LimitedPrivate("Filesystems")
-@InterfaceStability.Unstable
+@LimitedPrivate("Filesystems")
+@Unstable
 package org.apache.hadoop.fs.impl;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/prefetch/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/prefetch/package-info.java
index 1b26da85d95fb..3069b7a258117 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/prefetch/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/prefetch/package-info.java
@@ -20,9 +20,9 @@
  * block caching for use in object store clients.
  */
 
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+@Private
+@Unstable
 package org.apache.hadoop.fs.impl.prefetch;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java
index 48d6644e99b9e..71cecb1f8cc25 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
-@InterfaceStability.Unstable
+
+@LimitedPrivate({"HDFS", "MapReduce"})
+@Unstable
 package org.apache.hadoop.fs.local;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/package-info.java
index 6cee4eec0b544..5e4718b95840c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/package-info.java
@@ -18,8 +18,10 @@
 /**
  * This package provides support for HDFS permission and ACL.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.fs.permission;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java
index 92720bff69b16..a139a4631ba4f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.fs.shell;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/impl/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/impl/package-info.java
index 3ff7dacadce7a..11fc68ceb460a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/impl/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/impl/package-info.java
@@ -23,9 +23,9 @@
  * place over minor point releases.
  */
 
-@InterfaceAudience.LimitedPrivate("Filesystems")
-@InterfaceStability.Unstable
+@LimitedPrivate("Filesystems")
+@Unstable
 package org.apache.hadoop.fs.statistics.impl;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/package-info.java
index bf46b33a516c6..a33d4935b5ff0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/package-info.java
@@ -126,9 +126,9 @@
  * </ol>
  */
 
-@InterfaceAudience.Public
-@InterfaceStability.Unstable
+@Public
+@Unstable
 package org.apache.hadoop.fs.statistics;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/audit/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/audit/package-info.java
index 98fb5b59c3ac0..ac657fc307926 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/audit/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/audit/package-info.java
@@ -21,9 +21,10 @@
  * use within the hadoop-* modules only. No stability guarantees.
  * The public/evolving API is in {@code org.apache.hadoop.fs.audit}.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.fs.store.audit;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/package-info.java
index ebe1db479b42f..c77d4f7f3e942 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/store/package-info.java
@@ -20,9 +20,10 @@
  * This package is for classes to be shared across object stores; for internal
  * use within the hadoop-* modules only. No stability guarantees.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.fs.store;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/package-info.java
index 89986d0e5ef69..b83ef3920310d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/package-info.java
@@ -18,9 +18,10 @@
 /**
  * ViewFileSystem and ViewFileSystemOverloadScheme classes.
  */
-@InterfaceAudience.LimitedPrivate({"MapReduce", "HBase", "Hive" })
-@InterfaceStability.Stable
+
+@LimitedPrivate({"MapReduce", "HBase", "Hive"})
+@Stable
 package org.apache.hadoop.fs.viewfs;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Stable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java
index 32bbbf223073a..65e9e7a7e2877 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "MapReduce"})
-@InterfaceStability.Unstable
+
+@LimitedPrivate({"HBase", "HDFS", "MapReduce"})
+@Unstable
 package org.apache.hadoop.http;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java
index 785170eaf6297..3c0b3503a72b8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.compress.bzip2;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java
index 11827f1748628..33cffb6981556 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.compress.lz4;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java
index eedf6550833b1..a59acf614196b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.compress.snappy;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java
index 33d0a8d7cebf8..a6f9280a4c74a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.compress.zlib;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/package-info.java
index 9069070f73a45..f91a04b683910 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.compress.zstd;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/codec/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/codec/package-info.java
index ddfdd4b75bac8..4002f5f2a69b3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/codec/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/codec/package-info.java
@@ -7,22 +7,25 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Erasure codec framework.
  */
 
 /**
  * Erasure codec framework.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.erasurecode.codec;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/coder/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/coder/package-info.java
index 8ea40c5ca1b33..c1aeb8445c680 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/coder/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/coder/package-info.java
@@ -7,22 +7,25 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Erasure coders framework.
  */
 
 /**
  * Erasure coders framework.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.erasurecode.coder;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/package-info.java
index 034cdf2e70455..a670fb3f7621d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/package-info.java
@@ -7,13 +7,26 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ *
+ * Raw erasure coders.
+ *
+ * Raw erasure coder is part of erasure codec framework, where erasure coder is
+ * used to encode/decode a group of blocks (BlockGroup) according to the codec
+ * specific BlockGroup layout and logic. An erasure coder extracts chunks of
+ * data from the blocks and can employ various low level raw erasure coders to
+ * perform encoding/decoding against the chunks.
+ *
+ * To distinguish from erasure coder, here raw erasure coder is used to mean the
+ * low level constructs, since it only takes care of the math calculation with
+ * a group of byte buffers.
  */
 
 /**
@@ -30,9 +43,10 @@
  * low level constructs, since it only takes care of the math calculation with
  * a group of byte buffers.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.erasurecode.rawcoder;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/util/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/util/package-info.java
index c2339ac1444a4..7ee9492cad428 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/util/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/util/package-info.java
@@ -7,21 +7,24 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * General helpers for implementing raw erasure coders.
  */
 
 /**
  * General helpers for implementing raw erasure coders.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.erasurecode.rawcoder.util;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/package-info.java
index 346f895e6507f..3c54585eafc61 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/package-info.java
@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+
+@Private
+@Unstable
 package org.apache.hadoop.io.nativeio;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java
index 089cf6f54c7a5..cd71b54bea6fa 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java
@@ -20,12 +20,12 @@
  * A mechanism for selectively retrying methods that throw exceptions under
  * certain circumstances.
  * Typical usage is
- *  UnreliableImplementation unreliableImpl = new UnreliableImplementation();
- *  UnreliableInterface unreliable = (UnreliableInterface)
- *  RetryProxy.create(UnreliableInterface.class, unreliableImpl,
- *  RetryPolicies.retryUpToMaximumCountWithFixedSleep(4, 10,
- *      TimeUnit.SECONDS));
- *  unreliable.call();
+ * UnreliableImplementation unreliableImpl = new UnreliableImplementation();
+ * UnreliableInterface unreliable = (UnreliableInterface)
+ * RetryProxy.create(UnreliableInterface.class, unreliableImpl,
+ * RetryPolicies.retryUpToMaximumCountWithFixedSleep(4, 10,
+ * TimeUnit.SECONDS));
+ * unreliable.call();
  *
  * This will retry any method called on <code>unreliable</code> four times -
  * in this case the <code>call()</code> method - sleeping 10 seconds between
@@ -37,8 +37,10 @@
  * {@link org.apache.hadoop.io.retry.RetryProxy#create(Class, Object, Map)
  * per-method basis}.
  */
-@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "MapReduce"})
-@InterfaceStability.Evolving
+
+@LimitedPrivate({"HBase", "HDFS", "MapReduce"})
+@Evolving
 package org.apache.hadoop.io.retry;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java
index 262ed0d251a0e..a09a1fdd582eb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java
@@ -19,8 +19,10 @@
 /**
  * RPC related metrics.
  */
-@InterfaceAudience.Private
-@InterfaceStability.Evolving
+
+@Private
+@Evolving
 package org.apache.hadoop.ipc.metrics;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java
index cb35e938483b0..9d8c4d1a51c67 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java
@@ -19,8 +19,10 @@
 /**
  * Tools to help define network clients and servers.
  */
-@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "MapReduce"})
-@InterfaceStability.Evolving
+@LimitedPrivate({"HBase", "HDFS", "MapReduce"})
+@Evolving
 package org.apache.hadoop.ipc;
 import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java
index ef227f0b7041c..1fc754571dc25 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,8 @@
  * This package provides access to JMX primarily through the
  * {@link org.apache.hadoop.jmx.JMXJsonServlet} class.
  */
-@InterfaceAudience.Private
+
+@Private
 package org.apache.hadoop.jmx;
 
-import org.apache.hadoop.classification.InterfaceAudience;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Private;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java
index de0f5d0a4e2b5..332a277186042 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java
@@ -19,9 +19,10 @@
 /**
  * Annotation interfaces for metrics instrumentation
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2.annotation;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java
index 1fa7f21134724..d38c9bc16e4d9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java
@@ -19,9 +19,10 @@
 /**
  * Builtin metrics filters (to be used in metrics config files)
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2.filter;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java
index 82f490bf5adca..661f84bbe238d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java
@@ -19,9 +19,10 @@
 /**
  * A metrics system implementation
  */
-@InterfaceAudience.Private
-@InterfaceStability.Evolving
+
+@Private
+@Evolving
 package org.apache.hadoop.metrics2.impl;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java
index 52c8104f2a56f..979aaba054171 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java
@@ -19,9 +19,10 @@
 /**
  * A collection of library classes for implementing metrics sources
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2.lib;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
index 196469be9dce2..4388526d5c864 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
@@ -17,338 +17,339 @@
  */
 
 /**
-  <h1>Metrics 2.0</h1>
-  <ul id="toc">
-    <li><a href="#overview">Overview</a></li>
-    <li><a href="#gettingstarted">Getting Started</a></li>
-    <li><a href="#config">Configuration</a></li>
-    <li><a href="#filtering">Metrics Filtering</a></li>
-    <li><a href="#instrumentation">Metrics Instrumentation Strategy</a></li>
-    <li><a href="#migration">Migration from previous system</a></li>
-  </ul>
-  <h2><a name="overview">Overview</a></h2>
-  <p>This package provides a framework for metrics instrumentation
-    and publication.
-  </p>
-
-  <p>The framework provides a variety of ways to implement metrics
-    instrumentation easily via the simple
-    {@link org.apache.hadoop.metrics2.MetricsSource} interface
-    or the even simpler and more concise and declarative metrics annotations.
-    The consumers of metrics just need to implement the simple
-    {@link org.apache.hadoop.metrics2.MetricsSink} interface. Producers
-    register the metrics sources with a metrics system, while consumers
-    register the sinks. A default metrics system is provided to marshal
-    metrics from sources to sinks based on (per source/sink) configuration
-    options. All the metrics are also published and queryable via the
-    standard JMX MBean interface. This document targets the framework users.
-    Framework developers could also consult the
-    <a href="http://wiki.apache.org/hadoop/HADOOP-6728-MetricsV2">design
-    document</a> for architecture and implementation notes.
-  </p>
-  <h3>Sub-packages</h3>
-  <dl>
-    <dt><code>org.apache.hadoop.metrics2.annotation</code></dt>
-    <dd>Public annotation interfaces for simpler metrics instrumentation.
-    </dd>
-    <dt><code>org.apache.hadoop.metrics2.impl</code></dt>
-    <dd>Implementation classes of the framework for interface and/or
-      abstract classes defined in the top-level package. Sink plugin code
-      usually does not need to reference any class here.
-    </dd>
-    <dt> <code>org.apache.hadoop.metrics2.lib</code></dt>
-    <dd>Convenience classes for implementing metrics sources, including the
-      Mutable[{@link org.apache.hadoop.metrics2.lib.MutableGauge Gauge}*|
-      {@link org.apache.hadoop.metrics2.lib.MutableCounter Counter}*|
-      {@link org.apache.hadoop.metrics2.lib.MutableStat Stat}] and
-      {@link org.apache.hadoop.metrics2.lib.MetricsRegistry}.
-    </dd>
-    <dt> <code>org.apache.hadoop.metrics2.filter</code></dt>
-    <dd>Builtin metrics filter implementations include the
-      {@link org.apache.hadoop.metrics2.filter.GlobFilter} and
-      {@link org.apache.hadoop.metrics2.filter.RegexFilter}.
-    </dd>
-    <dt><code>org.apache.hadoop.metrics2.source</code></dt>
-    <dd>Builtin metrics source implementations including the
-      {@link org.apache.hadoop.metrics2.source.JvmMetrics}.
-    </dd>
-    <dt> <code>org.apache.hadoop.metrics2.sink</code></dt>
-    <dd>Builtin metrics sink implementations including the
-      {@link org.apache.hadoop.metrics2.sink.FileSink},
-      {@link org.apache.hadoop.metrics2.sink.GraphiteSink}, and
-      {@link org.apache.hadoop.metrics2.sink.StatsDSink}.
-    </dd>
-    <dt> <code>org.apache.hadoop.metrics2.util</code></dt>
-    <dd>General utilities for implementing metrics sinks etc., including the
-      {@link org.apache.hadoop.metrics2.util.MetricsCache}.
-    </dd>
-  </dl>
-
-  <h2><a name="gettingstarted">Getting started</a></h2>
-  <h3>Implementing metrics sources</h3>
-  <table width="99%" border="1" cellspacing="0" cellpadding="4">
-    <caption>Implementing metrics sources</caption>
-    <tbody>
-      <tr>
-        <th>Using annotations</th><th>Using MetricsSource interface</th>
-      </tr>
-      <tr><td>
-  <pre>
-  &#064;Metrics(context="MyContext")
-  class MyStat {
-
-    &#064;Metric("My metric description")
-    public int getMyMetric() {
-      return 42;
-    }
-  }</pre></td><td>
-  <pre>
-  class MyStat implements MetricsSource {
-
-    &#064;Override
-    public void getMetrics(MetricsCollector collector, boolean all) {
-      collector.addRecord("MyStat")
-          .setContext("MyContext")
-          .addGauge(info("MyMetric", "My metric description"), 42);
-    }
-  }
-  </pre>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <p>In this example we introduced the following:</p>
-  <dl>
-    <dt><em>&#064;Metrics</em></dt>
-    <dd>The {@link org.apache.hadoop.metrics2.annotation.Metrics} annotation is
-      used to indicate that the class is a metrics source.
-    </dd>
-
-    <dt><em>MyContext</em></dt>
-    <dd>The optional context name typically identifies either the
-      application, or a group of modules within an application or
-      library.
-    </dd>
-
-    <dt><em>MyStat</em></dt>
-    <dd>The class name is used (by default, or specified by name=value parameter
-      in the Metrics annotation) as the metrics record name for
-      which a set of metrics are to be reported.  For example, you could have a
-      record named "CacheStat" for reporting a number of statistics relating to
-      the usage of some cache in your application.</dd>
-
-    <dt><em>&#064;Metric</em></dt>
-    <dd>The {@link org.apache.hadoop.metrics2.annotation.Metric} annotation
-      identifies a particular metric, which in this case, is the
-      result of the method call getMyMetric of the "gauge" (default) type,
-      which means it can vary in both directions, compared with a "counter"
-      type, which can only increase or stay the same. The name of the metric
-      is "MyMetric" (inferred from getMyMetric method name by default.) The 42
-      here is the value of the metric which can be substituted with any valid
-      java expressions.
-    </dd>
-  </dl>
-  <p>Note, the {@link org.apache.hadoop.metrics2.MetricsSource} interface is
-    more verbose but more flexible,
-    allowing generated metrics names and multiple records. In fact, the
-    annotation interface is implemented with the MetricsSource interface
-    internally.</p>
-  <h3>Implementing metrics sinks</h3>
-  <pre>
-  public class MySink implements MetricsSink {
-    public void putMetrics(MetricsRecord record) {
-      System.out.print(record);
-    }
-    public void init(SubsetConfiguration conf) {}
-    public void flush() {}
-  }</pre>
-  <p>In this example there are three additional concepts:</p>
-  <dl>
-    <dt><em>record</em></dt>
-    <dd>This object corresponds to the record created in metrics sources
-      e.g., the "MyStat" in previous example.
-    </dd>
-    <dt><em>conf</em></dt>
-    <dd>The configuration object for the sink instance with prefix removed.
-      So you can get any sink specific configuration using the usual
-      get* method.
-    </dd>
-    <dt><em>flush</em></dt>
-    <dd>This method is called for each update cycle, which may involve
-      more than one record. The sink should try to flush any buffered metrics
-      to its backend upon the call. But it's not required that the
-      implementation is synchronous.
-    </dd>
-  </dl>
-  <p>In order to make use our <code>MyMetrics</code> and <code>MySink</code>,
-    they need to be hooked up to a metrics system. In this case (and most
-    cases), the <code>DefaultMetricsSystem</code> would suffice.
-  </p>
-  <pre>
-  DefaultMetricsSystem.initialize("test"); // called once per application
-  DefaultMetricsSystem.register(new MyStat());</pre>
-  <h2><a name="config">Metrics system configuration</a></h2>
-  <p>Sinks are usually specified in a configuration file, say,
-  "hadoop-metrics2-test.properties", as:
-  </p>
-  <pre>
-  test.sink.mysink0.class=com.example.hadoop.metrics.MySink</pre>
-  <p>The configuration syntax is:</p>
-  <pre>
-  [prefix].[source|sink|jmx|].[instance].[option]</pre>
-  <p>In the previous example, <code>test</code> is the prefix and
-    <code>mysink0</code> is an instance name.
-    <code>DefaultMetricsSystem</code> would try to load
-    <code>hadoop-metrics2-[prefix].properties</code> first, and if not found,
-    try the default <code>hadoop-metrics2.properties</code> in the class path.
-    Note, the <code>[instance]</code> is an arbitrary name to uniquely
-    identify a particular sink instance. The asterisk (<code>*</code>) can be
-    used to specify default options.
-  </p>
-  <p>Consult the metrics instrumentation in jvm, rpc, hdfs and mapred, etc.
-    for more examples.
-  </p>
-
-  <h2><a name="filtering">Metrics Filtering</a></h2>
-  <p>One of the features of the default metrics system is metrics filtering
-    configuration by source, context, record/tags and metrics. The least
-    expensive way to filter out metrics would be at the source level, e.g.,
-    filtering out source named "MyMetrics". The most expensive way would be
-    per metric filtering.
-  </p>
-  <p>Here are some examples:</p>
-  <pre>
-  test.sink.file0.class=org.apache.hadoop.metrics2.sink.FileSink
-  test.sink.file0.context=foo</pre>
-  <p>In this example, we configured one sink instance that would
-    accept metrics from context <code>foo</code> only.
-  </p>
-  <pre>
-  *.source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter
-  test.*.source.filter.include=foo
-  test.*.source.filter.exclude=bar</pre>
-  <p>In this example, we specify a source filter that includes source
-    <code>foo</code> and excludes <code>bar</code>. When only include
-    patterns are specified, the filter operates in the white listing mode,
-    where only matched sources are included. Likewise, when only exclude
-    patterns are specified, only matched sources are excluded. Sources that
-    are not matched in either patterns are included as well when both patterns
-    are present. Note, the include patterns have precedence over the exclude
-    patterns.
-  </p>
-  <p>Similarly, you can specify the <code>record.filter</code> and
-    <code>metric.filter</code> options, which operate at record and metric
-    level, respectively. Filters can be combined to optimize
-    the filtering efficiency.</p>
-
-  <h2><a name="instrumentation">Metrics instrumentation strategy</a></h2>
-
-  In previous examples, we showed a minimal example to use the
-  metrics framework. In a larger system (like Hadoop) that allows
-  custom metrics instrumentation, we recommend the following strategy:
-  <pre>
-  &#064;Metrics(about="My metrics description", context="MyContext")
-  class MyMetrics extends MyInstrumentation {
-
-    &#064;Metric("My gauge description") MutableGaugeInt gauge0;
-    &#064;Metric("My counter description") MutableCounterLong counter0;
-    &#064;Metric("My rate description") MutableRate rate0;
-
-    &#064;Override public void setGauge0(int value) { gauge0.set(value); }
-    &#064;Override public void incrCounter0() { counter0.incr(); }
-    &#064;Override public void addRate0(long elapsed) { rate0.add(elapsed); }
-  }
-  </pre>
-
-  Note, in this example we introduced the following:
-  <dl>
-    <dt><em>MyInstrumentation</em></dt>
-    <dd>This is usually an abstract class (or interface) to define an
-      instrumentation interface (incrCounter0 etc.) that allows different
-      implementations. This could be a mechanism to allow different metrics
-      systems to be used at runtime via configuration.
-    </dd>
-    <dt><em>Mutable[Gauge*|Counter*|Rate]</em></dt>
-    <dd>These are library classes to manage mutable metrics for
-      implementations of metrics sources. They produce immutable gauge and
-      counters (Metric[Gauge*|Counter*]) for downstream consumption (sinks)
-      upon <code>snapshot</code>. The <code>MutableRate</code>
-      in particular, provides a way to measure latency and throughput of an
-      operation. In this particular case, it produces a long counter
-      "Rate0NumOps" and double gauge "Rate0AvgTime" when snapshotted.
-    </dd>
-  </dl>
-
-  <h2><a name="migration">Migration from previous system</a></h2>
-  <p>Users of the previous metrics system would notice the lack of
-    <code>context</code> prefix in the configuration examples. The new
-    metrics system decouples the concept for context (for grouping) with the
-    implementation where a particular context object does the updating and
-    publishing of metrics, which causes problems when you want to have a
-    single context to be consumed by multiple backends. You would also have to
-    configure an implementation instance per context, even if you have a
-    backend that can handle multiple contexts (file, gangalia etc.):
-  </p>
-  <table width="99%" border="1" cellspacing="0" cellpadding="4">
-    <caption>Migration from previous system</caption>
-    <tbody>
-      <tr>
-        <th style='width="40%"'>Before</th><th>After</th>
-      </tr>
-      <tr>
-        <td><pre>
-  context1.class=org.hadoop.metrics.file.FileContext
-  context2.class=org.hadoop.metrics.file.FileContext
-  ...
-  contextn.class=org.hadoop.metrics.file.FileContext</pre>
-        </td>
-        <td><pre>
-  myprefix.sink.file.class=org.hadoop.metrics2.sink.FileSink</pre>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <p>In the new metrics system, you can simulate the previous behavior by
-    using the context option in the sink options like the following:
-  </p>
-  <table width="99%" border="1" cellspacing="0" cellpadding="4">
-    <caption>Metrics2</caption>
-    <tbody>
-      <tr>
-        <th style='width="40%"'>Before</th><th>After</th>
-      </tr>
-      <tr>
-        <td><pre>
-  context0.class=org.hadoop.metrics.file.FileContext
-  context0.fileName=context0.out
-  context1.class=org.hadoop.metrics.file.FileContext
-  context1.fileName=context1.out
-  ...
-  contextn.class=org.hadoop.metrics.file.FileContext
-  contextn.fileName=contextn.out</pre>
-        </td>
-        <td><pre>
-  myprefix.sink.*.class=org.apache.hadoop.metrics2.sink.FileSink
-  myprefix.sink.file0.context=context0
-  myprefix.sink.file0.filename=context0.out
-  myprefix.sink.file1.context=context1
-  myprefix.sink.file1.filename=context1.out
-  ...
-  myprefix.sink.filen.context=contextn
-  myprefix.sink.filen.filename=contextn.out</pre>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <p>to send metrics of a particular context to a particular backend. Note,
-    <code>myprefix</code> is an arbitrary prefix for configuration groupings,
-    typically they are the name of a particular process
-    (<code>namenode</code>, <code>jobtracker</code>, etc.)
-  </p>
+ * <h1>Metrics 2.0</h1>
+ * <ul id="toc">
+ * <li><a href="#overview">Overview</a></li>
+ * <li><a href="#gettingstarted">Getting Started</a></li>
+ * <li><a href="#config">Configuration</a></li>
+ * <li><a href="#filtering">Metrics Filtering</a></li>
+ * <li><a href="#instrumentation">Metrics Instrumentation Strategy</a></li>
+ * <li><a href="#migration">Migration from previous system</a></li>
+ * </ul>
+ * <h2><a name="overview">Overview</a></h2>
+ * <p>This package provides a framework for metrics instrumentation
+ * and publication.
+ * </p>
+ *
+ * <p>The framework provides a variety of ways to implement metrics
+ * instrumentation easily via the simple
+ * {@link org.apache.hadoop.metrics2.MetricsSource} interface
+ * or the even simpler and more concise and declarative metrics annotations.
+ * The consumers of metrics just need to implement the simple
+ * {@link org.apache.hadoop.metrics2.MetricsSink} interface. Producers
+ * register the metrics sources with a metrics system, while consumers
+ * register the sinks. A default metrics system is provided to marshal
+ * metrics from sources to sinks based on (per source/sink) configuration
+ * options. All the metrics are also published and queryable via the
+ * standard JMX MBean interface. This document targets the framework users.
+ * Framework developers could also consult the
+ * <a href="http://wiki.apache.org/hadoop/HADOOP-6728-MetricsV2">design
+ * document</a> for architecture and implementation notes.
+ * </p>
+ * <h3>Sub-packages</h3>
+ * <dl>
+ * <dt><code>org.apache.hadoop.metrics2.annotation</code></dt>
+ * <dd>Public annotation interfaces for simpler metrics instrumentation.
+ * </dd>
+ * <dt><code>org.apache.hadoop.metrics2.impl</code></dt>
+ * <dd>Implementation classes of the framework for interface and/or
+ * abstract classes defined in the top-level package. Sink plugin code
+ * usually does not need to reference any class here.
+ * </dd>
+ * <dt> <code>org.apache.hadoop.metrics2.lib</code></dt>
+ * <dd>Convenience classes for implementing metrics sources, including the
+ * Mutable[{@link org.apache.hadoop.metrics2.lib.MutableGauge Gauge}*|
+ * {@link org.apache.hadoop.metrics2.lib.MutableCounter Counter}*|
+ * {@link org.apache.hadoop.metrics2.lib.MutableStat Stat}] and
+ * {@link org.apache.hadoop.metrics2.lib.MetricsRegistry}.
+ * </dd>
+ * <dt> <code>org.apache.hadoop.metrics2.filter</code></dt>
+ * <dd>Builtin metrics filter implementations include the
+ * {@link org.apache.hadoop.metrics2.filter.GlobFilter} and
+ * {@link org.apache.hadoop.metrics2.filter.RegexFilter}.
+ * </dd>
+ * <dt><code>org.apache.hadoop.metrics2.source</code></dt>
+ * <dd>Builtin metrics source implementations including the
+ * {@link org.apache.hadoop.metrics2.source.JvmMetrics}.
+ * </dd>
+ * <dt> <code>org.apache.hadoop.metrics2.sink</code></dt>
+ * <dd>Builtin metrics sink implementations including the
+ * {@link org.apache.hadoop.metrics2.sink.FileSink},
+ * {@link org.apache.hadoop.metrics2.sink.GraphiteSink}, and
+ * {@link org.apache.hadoop.metrics2.sink.StatsDSink}.
+ * </dd>
+ * <dt> <code>org.apache.hadoop.metrics2.util</code></dt>
+ * <dd>General utilities for implementing metrics sinks etc., including the
+ * {@link org.apache.hadoop.metrics2.util.MetricsCache}.
+ * </dd>
+ * </dl>
+ *
+ * <h2><a name="gettingstarted">Getting started</a></h2>
+ * <h3>Implementing metrics sources</h3>
+ * <table width="99%" border="1" cellspacing="0" cellpadding="4">
+ * <caption>Implementing metrics sources</caption>
+ * <tbody>
+ * <tr>
+ * <th>Using annotations</th><th>Using MetricsSource interface</th>
+ * </tr>
+ * <tr><td>
+ * <pre>
+ * &#064;Metrics(context="MyContext")
+ * class MyStat {
+ *
+ * &#064;Metric("My metric description")
+ * public int getMyMetric() {
+ * return 42;
+ * }
+ * }</pre></td><td>
+ * <pre>
+ * class MyStat implements MetricsSource {
+ *
+ * &#064;Override
+ * public void getMetrics(MetricsCollector collector, boolean all) {
+ * collector.addRecord("MyStat")
+ * .setContext("MyContext")
+ * .addGauge(info("MyMetric", "My metric description"), 42);
+ * }
+ * }
+ * </pre>
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * <p>In this example we introduced the following:</p>
+ * <dl>
+ * <dt><em>&#064;Metrics</em></dt>
+ * <dd>The {@link org.apache.hadoop.metrics2.annotation.Metrics} annotation is
+ * used to indicate that the class is a metrics source.
+ * </dd>
+ *
+ * <dt><em>MyContext</em></dt>
+ * <dd>The optional context name typically identifies either the
+ * application, or a group of modules within an application or
+ * library.
+ * </dd>
+ *
+ * <dt><em>MyStat</em></dt>
+ * <dd>The class name is used (by default, or specified by name=value parameter
+ * in the Metrics annotation) as the metrics record name for
+ * which a set of metrics are to be reported.  For example, you could have a
+ * record named "CacheStat" for reporting a number of statistics relating to
+ * the usage of some cache in your application.</dd>
+ *
+ * <dt><em>&#064;Metric</em></dt>
+ * <dd>The {@link org.apache.hadoop.metrics2.annotation.Metric} annotation
+ * identifies a particular metric, which in this case, is the
+ * result of the method call getMyMetric of the "gauge" (default) type,
+ * which means it can vary in both directions, compared with a "counter"
+ * type, which can only increase or stay the same. The name of the metric
+ * is "MyMetric" (inferred from getMyMetric method name by default.) The 42
+ * here is the value of the metric which can be substituted with any valid
+ * java expressions.
+ * </dd>
+ * </dl>
+ * <p>Note, the {@link org.apache.hadoop.metrics2.MetricsSource} interface is
+ * more verbose but more flexible,
+ * allowing generated metrics names and multiple records. In fact, the
+ * annotation interface is implemented with the MetricsSource interface
+ * internally.</p>
+ * <h3>Implementing metrics sinks</h3>
+ * <pre>
+ * public class MySink implements MetricsSink {
+ * public void putMetrics(MetricsRecord record) {
+ * System.out.print(record);
+ * }
+ * public void init(SubsetConfiguration conf) {}
+ * public void flush() {}
+ * }</pre>
+ * <p>In this example there are three additional concepts:</p>
+ * <dl>
+ * <dt><em>record</em></dt>
+ * <dd>This object corresponds to the record created in metrics sources
+ * e.g., the "MyStat" in previous example.
+ * </dd>
+ * <dt><em>conf</em></dt>
+ * <dd>The configuration object for the sink instance with prefix removed.
+ * So you can get any sink specific configuration using the usual
+ * get* method.
+ * </dd>
+ * <dt><em>flush</em></dt>
+ * <dd>This method is called for each update cycle, which may involve
+ * more than one record. The sink should try to flush any buffered metrics
+ * to its backend upon the call. But it's not required that the
+ * implementation is synchronous.
+ * </dd>
+ * </dl>
+ * <p>In order to make use our <code>MyMetrics</code> and <code>MySink</code>,
+ * they need to be hooked up to a metrics system. In this case (and most
+ * cases), the <code>DefaultMetricsSystem</code> would suffice.
+ * </p>
+ * <pre>
+ * DefaultMetricsSystem.initialize("test"); // called once per application
+ * DefaultMetricsSystem.register(new MyStat());</pre>
+ * <h2><a name="config">Metrics system configuration</a></h2>
+ * <p>Sinks are usually specified in a configuration file, say,
+ * "hadoop-metrics2-test.properties", as:
+ * </p>
+ * <pre>
+ * test.sink.mysink0.class=com.example.hadoop.metrics.MySink</pre>
+ * <p>The configuration syntax is:</p>
+ * <pre>
+ * [prefix].[source|sink|jmx|].[instance].[option]</pre>
+ * <p>In the previous example, <code>test</code> is the prefix and
+ * <code>mysink0</code> is an instance name.
+ * <code>DefaultMetricsSystem</code> would try to load
+ * <code>hadoop-metrics2-[prefix].properties</code> first, and if not found,
+ * try the default <code>hadoop-metrics2.properties</code> in the class path.
+ * Note, the <code>[instance]</code> is an arbitrary name to uniquely
+ * identify a particular sink instance. The asterisk (<code>*</code>) can be
+ * used to specify default options.
+ * </p>
+ * <p>Consult the metrics instrumentation in jvm, rpc, hdfs and mapred, etc.
+ * for more examples.
+ * </p>
+ *
+ * <h2><a name="filtering">Metrics Filtering</a></h2>
+ * <p>One of the features of the default metrics system is metrics filtering
+ * configuration by source, context, record/tags and metrics. The least
+ * expensive way to filter out metrics would be at the source level, e.g.,
+ * filtering out source named "MyMetrics". The most expensive way would be
+ * per metric filtering.
+ * </p>
+ * <p>Here are some examples:</p>
+ * <pre>
+ * test.sink.file0.class=org.apache.hadoop.metrics2.sink.FileSink
+ * test.sink.file0.context=foo</pre>
+ * <p>In this example, we configured one sink instance that would
+ * accept metrics from context <code>foo</code> only.
+ * </p>
+ * <pre>
+ * .source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter
+ * test.*.source.filter.include=foo
+ * test.*.source.filter.exclude=bar</pre>
+ * <p>In this example, we specify a source filter that includes source
+ * <code>foo</code> and excludes <code>bar</code>. When only include
+ * patterns are specified, the filter operates in the white listing mode,
+ * where only matched sources are included. Likewise, when only exclude
+ * patterns are specified, only matched sources are excluded. Sources that
+ * are not matched in either patterns are included as well when both patterns
+ * are present. Note, the include patterns have precedence over the exclude
+ * patterns.
+ * </p>
+ * <p>Similarly, you can specify the <code>record.filter</code> and
+ * <code>metric.filter</code> options, which operate at record and metric
+ * level, respectively. Filters can be combined to optimize
+ * the filtering efficiency.</p>
+ *
+ * <h2><a name="instrumentation">Metrics instrumentation strategy</a></h2>
+ *
+ * In previous examples, we showed a minimal example to use the
+ * metrics framework. In a larger system (like Hadoop) that allows
+ * custom metrics instrumentation, we recommend the following strategy:
+ * <pre>
+ * &#064;Metrics(about="My metrics description", context="MyContext")
+ * class MyMetrics extends MyInstrumentation {
+ *
+ * &#064;Metric("My gauge description") MutableGaugeInt gauge0;
+ * &#064;Metric("My counter description") MutableCounterLong counter0;
+ * &#064;Metric("My rate description") MutableRate rate0;
+ *
+ * &#064;Override public void setGauge0(int value) { gauge0.set(value); }
+ * &#064;Override public void incrCounter0() { counter0.incr(); }
+ * &#064;Override public void addRate0(long elapsed) { rate0.add(elapsed); }
+ * }
+ * </pre>
+ *
+ * Note, in this example we introduced the following:
+ * <dl>
+ * <dt><em>MyInstrumentation</em></dt>
+ * <dd>This is usually an abstract class (or interface) to define an
+ * instrumentation interface (incrCounter0 etc.) that allows different
+ * implementations. This could be a mechanism to allow different metrics
+ * systems to be used at runtime via configuration.
+ * </dd>
+ * <dt><em>Mutable[Gauge*|Counter*|Rate]</em></dt>
+ * <dd>These are library classes to manage mutable metrics for
+ * implementations of metrics sources. They produce immutable gauge and
+ * counters (Metric[Gauge*|Counter*]) for downstream consumption (sinks)
+ * upon <code>snapshot</code>. The <code>MutableRate</code>
+ * in particular, provides a way to measure latency and throughput of an
+ * operation. In this particular case, it produces a long counter
+ * "Rate0NumOps" and double gauge "Rate0AvgTime" when snapshotted.
+ * </dd>
+ * </dl>
+ *
+ * <h2><a name="migration">Migration from previous system</a></h2>
+ * <p>Users of the previous metrics system would notice the lack of
+ * <code>context</code> prefix in the configuration examples. The new
+ * metrics system decouples the concept for context (for grouping) with the
+ * implementation where a particular context object does the updating and
+ * publishing of metrics, which causes problems when you want to have a
+ * single context to be consumed by multiple backends. You would also have to
+ * configure an implementation instance per context, even if you have a
+ * backend that can handle multiple contexts (file, gangalia etc.):
+ * </p>
+ * <table width="99%" border="1" cellspacing="0" cellpadding="4">
+ * <caption>Migration from previous system</caption>
+ * <tbody>
+ * <tr>
+ * <th style='width="40%"'>Before</th><th>After</th>
+ * </tr>
+ * <tr>
+ * <td><pre>
+ * context1.class=org.hadoop.metrics.file.FileContext
+ * context2.class=org.hadoop.metrics.file.FileContext
+ * ...
+ * contextn.class=org.hadoop.metrics.file.FileContext</pre>
+ * </td>
+ * <td><pre>
+ * myprefix.sink.file.class=org.hadoop.metrics2.sink.FileSink</pre>
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * <p>In the new metrics system, you can simulate the previous behavior by
+ * using the context option in the sink options like the following:
+ * </p>
+ * <table width="99%" border="1" cellspacing="0" cellpadding="4">
+ * <caption>Metrics2</caption>
+ * <tbody>
+ * <tr>
+ * <th style='width="40%"'>Before</th><th>After</th>
+ * </tr>
+ * <tr>
+ * <td><pre>
+ * context0.class=org.hadoop.metrics.file.FileContext
+ * context0.fileName=context0.out
+ * context1.class=org.hadoop.metrics.file.FileContext
+ * context1.fileName=context1.out
+ * ...
+ * contextn.class=org.hadoop.metrics.file.FileContext
+ * contextn.fileName=contextn.out</pre>
+ * </td>
+ * <td><pre>
+ * myprefix.sink.*.class=org.apache.hadoop.metrics2.sink.FileSink
+ * myprefix.sink.file0.context=context0
+ * myprefix.sink.file0.filename=context0.out
+ * myprefix.sink.file1.context=context1
+ * myprefix.sink.file1.filename=context1.out
+ * ...
+ * myprefix.sink.filen.context=contextn
+ * myprefix.sink.filen.filename=contextn.out</pre>
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * <p>to send metrics of a particular context to a particular backend. Note,
+ * <code>myprefix</code> is an arbitrary prefix for configuration groupings,
+ * typically they are the name of a particular process
+ * (<code>namenode</code>, <code>jobtracker</code>, etc.)
+ * </p>
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java
index 7632dc60bad29..57db91077b6c3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java
@@ -19,9 +19,10 @@
 /**
  * Builtin metrics sinks
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2.sink;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java
index cd7a23295b5b6..a32a544779e41 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java
@@ -19,9 +19,10 @@
 /**
  * General helpers for implementing source and sinks
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.metrics2.util;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/package-info.java
index 253642959a0ab..4066607fa2aee 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/package-info.java
@@ -18,6 +18,8 @@
 /**
  * Network-related classes.
  */
-@InterfaceAudience.Public
+
+@Public
 package org.apache.hadoop.net;
-import org.apache.hadoop.classification.InterfaceAudience;
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/package-info.java
index e1060e2196dcd..ffd7d0d1c8c64 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/package-info.java
@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@org.apache.hadoop.classification.InterfaceAudience.Public
+@org.apache.hadoop.classification.InterfaceStability.Evolving
 package org.apache.hadoop.security.authorize;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/package-info.java
index 8e9398eb67982..7ab70f4743246 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.security.http;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
index c85f967ab67c4..385c07ca7a620 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "MapReduce"})
-@InterfaceStability.Evolving
+
+@LimitedPrivate({"HBase", "HDFS", "MapReduce"})
+@Evolving
 package org.apache.hadoop.security.token.delegation;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/package-info.java
index e015056b43e88..0450ff4f4813a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/package-info.java
@@ -15,8 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.security.token;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/package-info.java
index 3716485549968..6bdf35904cd40 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/package-info.java
@@ -15,7 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@InterfaceAudience.Public
+
+@Public
 package org.apache.hadoop.service;
-import org.apache.hadoop.classification.InterfaceAudience;
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/package-info.java
index 2effb65872eb6..2f4561bb20e92 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/package-info.java
@@ -18,9 +18,9 @@
  * /
  */
 
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
+@Private
+@Unstable
 package org.apache.hadoop.util.concurrent;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/package-info.java
index 7b93f5a311f56..45a9373da885e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/package-info.java
@@ -7,21 +7,24 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * This package provides utilities to interact with Curator ZooKeeper.
  */
 
 /**
  * This package provides utilities to interact with Curator ZooKeeper.
  */
-@InterfaceAudience.Public
-@InterfaceStability.Evolving
+
+@Public
+@Evolving
 package org.apache.hadoop.util.curator;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
\ No newline at end of file
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/functional/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/functional/package-info.java
index 18d23b31ff6d7..071e1b69ae63c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/functional/package-info.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/functional/package-info.java
@@ -33,9 +33,10 @@
  * of wrapped iterators can supply statistics of the inner iterators, and
  * encourage close() to be called after use.
  */
-@InterfaceAudience.Public
-@InterfaceStability.Unstable
+
+@Public
+@Unstable
 package org.apache.hadoop.util.functional;
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
\ No newline at end of file