Add rename variables
Merge remote-tracking branch 'origin/dev-java' into dev-java