Applied patch from materDaddy to fix naming problems with Drawable class.