Updated versions mapping to be more ES-like (bug 892618)