Rename component classes to new short variants and align with new ReactJS