refactoring v1.1

rename + refactor