Namespace changes
Accommodate Java 6 TM