refactor + general name
fix