Rename and slight refactoring