Update naming/ids