Little rename refactorings etc.