Rename function - was too cumbersome.