Some name changing + update dry part