Revert to previous naming convention for compatability