Rename variable
Refactoring DATA Layer