Refactor names before new feature implement
Add travis support