naming refactor
naming refactor
#3, #4 data binding