Updated to match naming conventions