rename of java5 clients accordingly to the branch needs