switch to new naming