Minor bug fixes in variable naming.