Updated code for change in interface name.
Merge branch 'master' into core