Fix prefix for env vars & system properties