Match @container-* to the new @screen-* variable names

Created by: pmucha

The @screen-desktop and similar variables are going away, so why keep the @container-desktop and don't change it to @container-md (and others)?