minor fix on agent name and java package import cleanup