minor cleanup and naming clarifications
working in testing integration with eclipse/gradle