refactoring v1.0

rename variables only