Variable renaming. Refs #38