I've checked and now we are using them or in JS or CSS. I think renaming all of this should be in other bug, because could produce a bunch of regression. The idea behind this patch is getting the benefit of the flex layout as soon as possible, so we could work on this in a separate bug.