Refactor naming
Add license