* Now supports the new naming scheme