Refactoring, change of names, etc