Variable name changes
Reorganization