Updated overview for new naming structure