Move namechecks here