Future Java versions may not support _ as identifier.

~~Left previous method as deprecated for current API items.~~  Also removed some unused imports.