Replace the old convention everywhere else