Swithced to new naming convention for old interfaces.