Whoops... Switch API naming conventions!