Add symbolic call; adjust generator naming conventions