Made some adjustments due to naming change and some 
other changes