Started conversion to Java naming conventions (lower case methods/members); some refactoring