Update system property settings
Update javadoc to reflect renamed system properties