Make abstraction consistent.
Merge pull request #1044 from stevepiercy/master

Make abstraction variables consistent.