Switched to new naming conventions