Fixed naming inconsistency more.