Edit to resolv name convention