Bump to 2.0 by removing deprecated class aliases