Rename a few variable names
Add deprecation warning