fixes to naming conventions and not writing classpath as it bombs the jvm