update for new naming conventions