Update for naming conventions