Preliminary changes of references from 2.4 to 2.6