WIP: Updated variable naming.