Rename dependency resolver classes