Change naming scheme for the override macro