renamed some adamant stuff and resorted equipment