Add missing renamings.
Fix missing renamings in vs2010 project
Removed tests accidentally added.
Merge pull request #307 from arstrube/missing_renamings

Missing renamings