name and settings refactor