Updated to match new naming conventions