Rename component classes to new short variants and lign to new ReactJS