Fixed variable renaming
Fixed procedure renaming
Merge pull request #171 from nathan/rename-fix

Fixed renaming procedures and variables