Fixed namings. Included DOMAIN in vars