Redone structure and naming