Couple of class references updated for case sensitivity