Updated namestandard